summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mingw: add a regression test for pushing to UNC pathsjs/mingw-test-push-unc-pathJohannes Schindelin2017-01-071-0/+48
* 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
* | | | | | | | Merge branch 'kh/tutorial-grammofix'Junio C Hamano2016-12-191-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: omit needless "for"kh/tutorial-grammofixKristoffer Haugsbakk2016-12-091-1/+1
| * | | | | | | | doc: make the intent of sentence clearerKristoffer Haugsbakk2016-12-091-1/+1
| * | | | | | | | doc: add verb in front of command to runKristoffer Haugsbakk2016-12-091-1/+1
| * | | | | | | | doc: add articles (grammar)Kristoffer Haugsbakk2016-12-091-3/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'da/mergetool-xxdiff-hotkey'Junio C Hamano2016-12-191-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | mergetools: fix xxdiff hotkeysda/mergetool-xxdiff-hotkeyDavid Aguilar2016-12-111-5/+5
* | | | | | | | | Merge branch 'lr/doc-fix-cet'Junio C Hamano2016-12-191-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | date-formats.txt: Typo fixlr/doc-fix-cetLuis Ressel2016-12-121-1/+1
* | | | | | | | | | Merge branch 'sb/t3600-cleanup'Junio C Hamano2016-12-191-73/+51
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t3600: slightly modernize stylesb/t3600-cleanupStefan Beller2016-12-121-73/+51
| * | | | | | | | | | t3600: remove useless redirectStefan Beller2016-12-051-1/+1
* | | | | | | | | | | Merge branch 'jc/pull-rebase-ff'Junio C Hamano2016-12-192-4/+35
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pull: fast-forward "pull --rebase=true"jc/pull-rebase-ffJunio C Hamano2016-11-292-4/+35
* | | | | | | | | | | | Merge branch 'ld/p4-worktree'Junio C Hamano2016-12-193-4/+65
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-p4: support git worktreesld/p4-worktreeLuke Diamand2016-12-133-4/+65
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |