Commits

Author Commit Message Labels Comments Date
Nikolai Weibull
Documentation/git-update-server-info.txt: Add -f alias for --force to documentation. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull
Documentation/git-http-fetch.txt: Document the commit-id argument. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull
Documentation/git-repack.txt: Add -l and -n. This adds documentation for the -l and -n options to git-repack. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull
Documentation/git-ls-remote.txt: Add -h and -t. -h and -t are aliases for --heads and --tags to git-ls-remote. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull
Documentation/git-format-patch.txt: Add --signoff, --check, and long option-names. The documentation was lacking descriptions for the --signoff and --check options to git-format-patch. It was also missing the following long option-names: --output-directory (-o), --numbered (-n), --keep-subject (-k), --author (-a), --date (-d), and --mbox (-m). Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull
Add documentation for the --topo-order option to git-show-branch. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull
Add documentation for git-revert and git-cherry-pick. * Added the -e option to the documentation of git-cherry-pick. * Added the -e and --no-commit option to git-revert. * Removed redundant case expression for -n as --no-edit (already taken by --no-commit). Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull
Documentation/git-cherry-pick: Add --replay and --no-commit. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull
Documentation/git-cvsimport.txt: Fix a slight glitch in description heading. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull
Documentation/git-verify-pack.txt: added documentation for --. The -- option has been added to the documentation of git-verify-pack. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull
Documentation/git-commit.txt: Add long options and -- to documentation. Added the following long options to documentation: * --all * --signoff * --verify * --no-verify * --edit Also added documentation for the -- option for terminating option parsing. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull
Use uniform description for the '--' option. All descriptions of the '--' option were the same except for that in Documentation/git-merge-index.txt. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull
Fix the description of --utf8 and --keep to git-am. The git-am script actually transform --utf8 and --keep to -u and -k when sent to git-mailinfo. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull
Document the --non-empty command-line option to git-pack-objects. This provides (minimal) documentation for the --non-empty command-line option to the pack-objects command. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
show-branch: comment typo Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Documentation: recursive is the default strategy these days. We still said resolve was the default in handful places. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Make sure we use compat/subprocess.py with Python 2.3 while running tests. Otherwise the test will not succeed without installing. Signed-off-by: Junio C Hamano <junkio@cox.net>
Daniel Barkalow
Clean up file descriptors when calling hooks. When calling post-update hook, don't leave stdin and stdout connected to the pushing connection. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
refs.c: make sure leading directories exist before writing a ref. Otherwise cloning a repository with hierarchical branch/tag over http would fail. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Documentation(tutorial): adjust merge example to the new merge world order. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Documentation(cvs-migration): minor cleanups. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Documentation(glossary): minor formatting clean-ups. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Documentation: git.html/git.7 Finish each sentence with a full stop. Instead of saying 'directory index' 'directory cache' etc, consistently say 'index'. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Paul Mackerras
gitk: Work around Tcl's non-standard names for encodings This uses a table of encoding names and aliases distilled from http://www.iana.org/assignments/character-sets plus some heuristics to convert standard encoding names to ones that Tcl recognizes. Signed-off-by: Paul Mackerras <paulus@samba.org>
Junio C Hamano
update-index: allow --index-info to add higher stages. The new merge world order tells the merge strategies to leave the cache unmerged and store the automerge result in the working tree if automerge is not clean. This was done for the resolve strategy and recursive strategy when no rename is involved, but recording a conflicting merge in the rename case could not easily be done by the recursive strategy. This commit adds a new input format, in addi…
Junio C Hamano
git-merge-one: new merge world order. This does two things: - Use new --stage=2 option to create the working tree file with leading paths and correct permission bits using checkout-index, as before. - Make sure we do not confuse "merge" program when the file being merged has an unfortunate name, '-L'. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
checkout-index: allow checking out from higher stages. The new option, --stage=<n>, lets you copy out from an unmerged, higher stage. This is to help the new merge world order during a nontrivial merge. Signed-off-by: Junio C Hamano <junkio@cox.net>
Jason Riedy
Use printf rather than echo -n. On AIX, there is no -n option to the system's echo. Instead, it needs the '\c' control character. We could replace echo -n "foo" with echo -e "foo\c" but printf is recommended by most man pages. Tested on AIX 5.3, Solaris 8, and Debian. [jc: futureproofed two instances that uses variable with '%s' so later feeding different messages would not break things too easily; others are emitting …
Junio C Hamano
qsort() ptrdiff_t may be larger than int Morten Welinder <mwelinder@gmail.com> writes: > The code looks wrong. It assumes that pointers are no larger than ints. > If pointers are larger than ints, the code does not necessarily compute > a consistent ordering and qsort is allowed to do whatever it wants. > > Morten > > static int compare_object_pointers(const void *a, const void *b) > { > const struct object * const *pa = a; > const s…
  1. Prev
  2. Next