Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.7.2.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.2.4
Junio C Hamano
Git 1.7.1.3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.1.3
Junio C Hamano
Git 1.7.0.8 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.0.8
Junio C Hamano
Merge branch 'maint-1.7.1' into maint-1.7.2 * maint-1.7.1: add: introduce add.ignoreerrors synonym for add.ignore-errors
Junio C Hamano
Merge branch 'maint-1.7.0' into maint-1.7.1 * maint-1.7.0: add: introduce add.ignoreerrors synonym for add.ignore-errors
Jonathan Nieder
add: introduce add.ignoreerrors synonym for add.ignore-errors The "[add] ignore-errors" tweakable introduced by v1.5.6-rc0~30^2 (Add a config option to ignore errors for git-add, 2008-05-12) does not follow the usual convention for naming values in the git configuration file. What convention? Glad you asked. The section name indicates the affected subsystem. The subsection name, if any, indicates which of an unbound set of things to set the value for.…
knittl
bash: Match lightweight tags in prompt The bash prompt would display a commit's object name when having checked out a lightweight tag. Provide `--tags` to `git describe` in the completion script, so it will display lightweight tag names, as it already does for annotated tags. Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jari Aalto
git-commit.txt: (synopsis): move -i and -o before "--" All options, including -i and -o, must come before "--" which is the end of options marker. Reported-by: Joey Hess <joey@kitenet.net> Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
t3101: modernise style Also add a few " &&" cascade that were missing. Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe
compat/nedmalloc: don't force NDEBUG on the rest of git Define the nedmalloc feature configuration macros for nedmalloc.o, only. This keeps assert(3) working for the rest of the git source; it was turned off for nedmalloc users before by defining NDEBUG globally. Also remove -DUSE_NED_ALLOCATOR as this macro isn't used anywhere. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Mark Lodato
config.txt: fix placement of diff.noprefix In git-config(1), diff.noprefix was placed in between diff.mnemonicprefix and the list of mnemonic prefixes, which is obviously incorrect and very confusing to readers. Now, it is located after the end of the explanation of mnemonicprefix, which makes much more sense. Signed-off-by: Mark Lodato <lodatom@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Casey
xdiff-interface.c: always trim trailing space from xfuncname matches Generally, trailing space is removed from the string matched by the xfuncname patterns. The exception is when the matched string exceeds the length of the fixed-size buffer that it will be copied in to. But, a string that exceeds the buffer can still contain trailing space in the portion of the string that will be copied into the buffer. So, simplify this code slightly, and just perform the tra…
Brandon Casey
diff.c: call regfree to free memory allocated by regcomp when necessary Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren
revert: Fix trivial comment style issue Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren
cache_tree_free: Fix small memory leak Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'xx/trivial' into maint * xx/trivial: tag.c: whitespace breakages fix Fix whitespace issue in object.c t5505: add missing &&
Junio C Hamano
tag.c: whitespace breakages fix Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jared Hance
Fix whitespace issue in object.c Change some expanded tabs (spaces) to tabs in object.c. Signed-off-by: Jared Hance <jaredhance@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann
t5505: add missing && Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.7.2.3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.2.3
Thiago Farina
builtin/merge_recursive.c: Add an usage string and make use of it. This improves the usage output by adding builtin_merge_recursive_usage string that follows the same pattern used by the other builtin commands. The previous output for git merger-recursive was: usage: merge-recursive <base>... -- <head> <remote> ... Now the output is: usage: git merge-recursive <base>... -- <head> <remote> ... Since cmd_merge_recursive is used to handle four different commands …
Junio C Hamano
Prepare for 1.7.2.3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'gp/pack-refs-remove-empty-dirs' into maint * gp/pack-refs-remove-empty-dirs: pack-refs: remove newly empty directories
Junio C Hamano
Merge branch 'sg/rerere-gc-old-still-used' into maint * sg/rerere-gc-old-still-used: rerere: fix overeager gc mingw_utime(): handle NULL times parameter
Junio C Hamano
Merge branch 'np/maint-huge-delta-generation' into maint * np/maint-huge-delta-generation: fix >4GiB source delta assertion failure
Junio C Hamano
Merge branch 'dj/fetch-tagopt' into maint * dj/fetch-tagopt: fetch: allow command line --tags to override config
Junio C Hamano
Merge branch 'da/fix-submodule-sync-superproject-config' into maint * da/fix-submodule-sync-superproject-config: submodule sync: Update "submodule.<name>.url"
Junio C Hamano
Merge branch 'en/rebase-against-rebase-fix' into maint * en/rebase-against-rebase-fix: pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
Junio C Hamano
Merge branch 'maint-1.7.1' into maint * maint-1.7.1: t0003: add missing && at end of lines
Matthieu Moy
t0003: add missing && at end of lines Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
  1. Prev
  2. Next