summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | difftool: chdir as early as possibleDavid Aguilar2016-12-111-12/+14
| * | | | | | | | | | | difftool: sanitize $workdir as early as possibleDavid Aguilar2016-12-111-3/+2
| * | | | | | | | | | | difftool: fix dir-diff index creation when in a subdirectoryDavid Aguilar2016-12-112-3/+45
* | | | | | | | | | | | Merge branch 'ld/p4-compare-dir-vs-symlink' into maintJunio C Hamano2017-01-172-6/+63
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-p4: avoid crash adding symlinked directoryld/p4-compare-dir-vs-symlinkLuke Diamand2016-12-182-6/+63
* | | | | | | | | | | | | Merge branch 'jc/push-default-explicit' into maintJunio C Hamano2017-01-172-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
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jt/mailinfo-fold-in-body-headers' into maintJunio C Hamano2017-01-171-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' into maintJunio C Hamano2017-01-177-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' into maintJunio C Hamano2017-01-171-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' into maintJunio C Hamano2017-01-175-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 'nd/shallow-fixup' into maintJunio C Hamano2017-01-171-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' into maintJunio C Hamano2017-01-173-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
* | | | | | | | | | | | | | | | | Merge branch 'da/mergetool-xxdiff-hotkey' into maintJunio C Hamano2017-01-171-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | mergetools: fix xxdiff hotkeysda/mergetool-xxdiff-hotkeyDavid Aguilar2016-12-111-5/+5
* | | | | | | | | | | | | | | | | | Merge branch 'jc/pull-rebase-ff' into maintJunio C Hamano2017-01-172-4/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | pull: fast-forward "pull --rebase=true"jc/pull-rebase-ffJunio C Hamano2016-11-292-4/+35
* | | | | | | | | | | | | | | | | | | Merge branch 'js/normalize-path-copy-ceil' into maintJunio C Hamano2017-01-171-9/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | normalize_path_copy(): fix pushing to //server/share/dir on Windowsjs/normalize-path-copy-ceilJohannes Sixt2016-12-161-9/+14
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'ak/commit-only-allow-empty' into maintJunio C Hamano2017-01-173-4/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | commit: remove 'Clever' message for --only --amendak/commit-only-allow-emptyAndreas Krey2016-12-091-2/+0
| * | | | | | | | | | | | | | | | | | | commit: make --only --allow-empty work without pathsAndreas Krey2016-12-053-2/+12
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'da/difftool-dir-diff-fix' into maintJunio C Hamano2017-01-172-3/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | difftool: fix dir-diff index creation when in a subdirectoryda/difftool-dir-diff-fixDavid Aguilar2016-12-082-3/+45
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'jb/diff-no-index-no-abbrev' into maintJunio C Hamano2017-01-178-1/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | diff: handle --no-abbrev in no-index casejb/diff-no-index-no-abbrevJack Bates2016-12-088-1/+39