summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | i18n: add--interactive: remove %patch_modes entriesVasco Almeida2016-12-141-21/+0
| * | | | | | | | | | | | i18n: add--interactive: mark edit_hunk_manually message for translationVasco Almeida2016-12-141-13/+39
| * | | | | | | | | | | | i18n: add--interactive: i18n of help_patch_cmdVasco Almeida2016-12-141-8/+46
| * | | | | | | | | | | | i18n: add--interactive: mark patch prompt for translationVasco Almeida2016-12-144-11/+61
| * | | | | | | | | | | | i18n: add--interactive: mark plural stringsVasco Almeida2016-12-144-12/+39
| * | | | | | | | | | | | i18n: clean.c: match string with git-add--interactive.perlVasco Almeida2016-12-141-5/+5
| * | | | | | | | | | | | i18n: add--interactive: mark strings with interpolation for translationVasco Almeida2016-12-141-12/+13
| * | | | | | | | | | | | i18n: add--interactive: mark simple here-documents for translationVasco Almeida2016-12-141-3/+5
| * | | | | | | | | | | | i18n: add--interactive: mark strings for translationVasco Almeida2016-12-141-34/+42
| * | | | | | | | | | | | Git.pm: add subroutines for commenting linesVasco Almeida2016-12-141-0/+38
* | | | | | | | | | | | | Merge branch 'sb/submodule-config-cleanup'Junio C Hamano2016-12-274-42/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | submodule-config: clarify parsing of null_sha1 elementsb/submodule-config-cleanupStefan Beller2016-11-221-2/+5
| * | | | | | | | | | | | | submodule-config: rename commit_sha1 to treeish_nameStefan Beller2016-11-224-29/+44
| * | | | | | | | | | | | | submodule config: inline config_from_{name, path}Stefan Beller2016-11-221-14/+2
* | | | | | | | | | | | | | Merge branch 'jc/push-default-explicit'Junio C Hamano2016-12-272-2/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | push: test pushing ambiguously named branchesjc/push-default-explicitDennis Kaarsemaker2016-10-311-0/+10
| * | | | | | | | | | | | | | push: do not use potentially ambiguous default refspecJunio C Hamano2016-10-281-2/+5
* | | | | | | | | | | | | | | Third batch for 2.12Junio C Hamano2016-12-211-0/+40
* | | | | | | | | | | | | | | Merge branch 'jt/mailinfo-fold-in-body-headers'Junio C Hamano2016-12-211-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | mailinfo.c: move side-effects outside of assertjt/mailinfo-fold-in-body-headersKyle J. McKay2016-12-201-1/+2
* | | | | | | | | | | | | | | | Merge branch 'jk/index-pack-wo-repo-from-stdin'Junio C Hamano2016-12-217-47/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | index-pack: skip collision check when not in repositoryjk/index-pack-wo-repo-from-stdinJeff King2016-12-161-4/+6
| * | | | | | | | | | | | | | | | t: use nongit() function where applicableJeff King2016-12-163-29/+5
| * | | | | | | | | | | | | | | | index-pack: complain when --stdin is used outside of a repoJeff King2016-12-162-0/+17
| * | | | | | | | | | | | | | | | t5000: extract nongit function to test-lib-functions.shJeff King2016-12-162-14/+14
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jk/parseopt-usage-msg-opt'Junio C Hamano2016-12-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | parse-options: print "fatal:" before usage_msg_opt()jk/parseopt-usage-msg-optJeff King2016-12-141-1/+1
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jk/quote-env-path-list-component'Junio C Hamano2016-12-215-12/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t5615-alternate-env: double-quotes in file names do not work on WindowsJohannes Sixt2016-12-211-1/+1
| * | | | | | | | | | | | | | | | t5547-push-quarantine: run the path separator test on Windows, tooJohannes Sixt2016-12-131-4/+10
| * | | | | | | | | | | | | | | | tmp-objdir: quote paths we add to alternatesJeff King2016-12-122-1/+36
| * | | | | | | | | | | | | | | | alternates: accept double-quoted pathsJeff King2016-12-123-11/+60
| * | | | | | | | | | | | | | | | Merge branch 'jk/alt-odb-cleanup' into jk/quote-env-path-list-componentJunio C Hamano2016-12-122-1/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vs/submodule-clone-nested-submodules-alternates'Junio C Hamano2016-12-212-2/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | submodule--helper: set alternateLocation for cloned submodulesvs/submodule-clone-nested-submodules-alternatesVitaly "_Vi" Shukela2016-12-122-2/+83
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/shallow-fixup'Junio C Hamano2016-12-211-19/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | shallow.c: remove useless codend/shallow-fixupNguyễn Thái Ngọc Duy2016-12-071-4/+0
| * | | | | | | | | | | | | | | | | | | shallow.c: bit manipulation tweaksRasmus Villemoes2016-12-071-4/+4
| * | | | | | | | | | | | | | | | | | | shallow.c: avoid theoretical pointer wrap-aroundRasmus Villemoes2016-12-071-1/+1
| * | | | | | | | | | | | | | | | | | | shallow.c: make paint_alloc slightly more robustNguyễn Thái Ngọc Duy2016-12-071-0/+3
| * | | | | | | | | | | | | | | | | | | shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory poolsNguyễn Thái Ngọc Duy2016-12-071-2/+4
| * | | | | | | | | | | | | | | | | | | shallow.c: rename fields in paint_info to better express their purposesNguyễn Thái Ngọc Duy2016-12-071-9/+9
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'sb/sequencer-abort-safety'Junio C Hamano2016-12-213-2/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Revert "sequencer: remove useless get_dir() function"sb/sequencer-abort-safetyJunio C Hamano2016-12-141-1/+6
| * | | | | | | | | | | | | | | | | | | sequencer: remove useless get_dir() functionStephan Beyer2016-12-091-6/+1
| * | | | | | | | | | | | | | | | | | | sequencer: make sequencer abort saferStephan Beyer2016-12-092-1/+50
| * | | | | | | | | | | | | | | | | | | t3510: test that cherry-pick --abort does not unsafely change HEADStephan Beyer2016-12-091-0/+10
| * | | | | | | | | | | | | | | | | | | am: change safe_to_abort()'s not rewinding error into a warningStephan Beyer2016-12-081-1/+1
| * | | | | | | | | | | | | | | | | | | am: fix filename in safe_to_abort() error messageStephan Beyer2016-12-081-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Second batch for 2.12Junio C Hamano2016-12-191-3/+90