Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | push: test pushing ambiguously named branchesjc/push-default-explicit | Dennis Kaarsemaker | 2016-10-31 | 1 | -0/+10 |
* | Merge branch 'da/difftool' into maint | Junio C Hamano | 2016-06-06 | 1 | -0/+23 |
|\ | |||||
| * | difftool: handle unmerged files in dir-diff modeda/difftool | David Aguilar | 2016-05-16 | 1 | -0/+23 |
* | | Merge branch 'tb/core-eol-fix' into maint | Junio C Hamano | 2016-06-06 | 1 | -170/+131 |
|\ \ | |||||
| * | | convert.c: ident + core.autocrlf didn't worktb/core-eol-fix | Torsten Bögershausen | 2016-04-25 | 1 | -1/+1 |
| * | | t0027: test cases for combined attributes | Torsten Bögershausen | 2016-04-25 | 1 | -169/+129 |
| * | | t0027: make commit_chk_wrnNNO() reliable | Torsten Bögershausen | 2016-04-25 | 1 | -1/+2 |
* | | | Merge branch 'ar/diff-args-osx-precompose' into maint | Junio C Hamano | 2016-06-06 | 1 | -0/+42 |
|\ \ \ | |||||
| * | | | diff: run arguments through precompose_argvar/diff-args-osx-precompose | Alexander Rinass | 2016-05-13 | 1 | -0/+42 |
* | | | | Merge branch 'sb/submodule-deinit-all' into maint | Junio C Hamano | 2016-05-31 | 1 | -1/+23 |
|\ \ \ \ | |||||
| * | | | | submodule deinit: require '--all' instead of '.' for all submodules | Stefan Beller | 2016-05-05 | 1 | -1/+23 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maint | Junio C Hamano | 2016-05-31 | 2 | -3/+16 |
|\ \ \ \ | |||||
| * | | | | test-lib: set BASH_XTRACEFD automaticallyjk/test-send-sh-x-trace-elsewhere | Jeff King | 2016-05-11 | 2 | -3/+16 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'js/name-rev-use-oldest-ref' into maint | Junio C Hamano | 2016-05-31 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | name-rev: include taggerdate in considering the best namejs/name-rev-use-oldest-ref | Johannes Schindelin | 2016-04-22 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'jc/fsck-nul-in-commit' into maint | Junio C Hamano | 2016-05-26 | 1 | -0/+18 |
|\ \ \ \ | |||||
| * | | | | fsck: detect and warn a commit with embedded NULjc/fsck-nul-in-commit | Junio C Hamano | 2016-05-10 | 1 | -0/+18 |
* | | | | | Merge branch 'js/windows-dotgit' into maint | Junio C Hamano | 2016-05-26 | 2 | -0/+50 |
|\ \ \ \ \ | |||||
| * | | | | | mingw: introduce the 'core.hideDotFiles' setting | Johannes Schindelin | 2016-05-11 | 2 | -0/+50 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'lp/typofixes' into maint | Junio C Hamano | 2016-05-26 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | typofix: assorted typofixes in comments, documentation and messageslp/typofixes | Li Peng | 2016-05-06 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'sb/z-is-gnutar-ism' into maint | Junio C Hamano | 2016-05-26 | 2 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | t6041: do not compress backup tar filesb/z-is-gnutar-ism | Stefan Beller | 2016-05-09 | 1 | -2/+2 |
| * | | | | | t3513: do not compress backup tar file | Stefan Beller | 2016-05-09 | 1 | -2/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'va/i18n-misc-updates' into maint | Junio C Hamano | 2016-05-26 | 1 | -9/+9 |
|\ \ \ \ \ | |||||
| * | | | | | i18n: unpack-trees: avoid substituting only a verb in sentencesva/i18n-misc-updates | Vasco Almeida | 2016-05-12 | 1 | -9/+9 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'ak/t4151-ls-files-could-be-empty' into maint | Junio C Hamano | 2016-05-26 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | t4151: make sure argument to 'test -z' is givenak/t4151-ls-files-could-be-empty | Armin Kunaschik | 2016-05-09 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'jc/test-seq' into maint | Junio C Hamano | 2016-05-26 | 1 | -15/+13 |
|\ \ \ \ \ | |||||
| * | | | | | test-lib-functions.sh: rewrite test_seq without Perljc/test-seq | Junio C Hamano | 2016-05-09 | 1 | -1/+6 |
| * | | | | | test-lib-functions.sh: remove misleading comment on test_seq | Junio C Hamano | 2016-05-09 | 1 | -14/+7 |
| |/ / / / | |||||
* | | | | | Merge branch 'tb/t5601-sed-fix' into maint | Junio C Hamano | 2016-05-26 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | t5601: Remove trailing space in sed expressiontb/t5601-sed-fix | Torsten Bögershausen | 2016-05-09 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'sb/clean-test-fix' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | t7300: mark test with SANITYsb/clean-test-fix | Stefan Beller | 2016-05-03 | 1 | -1/+1 |
* | | | | | | Merge branch 'sg/test-lib-simplify-expr-away' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -5/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | test-lib: simplify '--option=value' parsingsg/test-lib-simplify-expr-away | SZEDER Gábor | 2016-04-22 | 1 | -5/+5 |
* | | | | | | | Merge branch 'js/close-packs-before-gc' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t5510: run auto-gc in the foregroundjs/close-packs-before-gc | SZEDER Gábor | 2016-05-02 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'ls/p4-lfs' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-p4: fix Git LFS pointer parsing | Lars Schneider | 2016-04-28 | 1 | -0/+4 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t9824: fix wrong reference valuels/p4-lfs-test-fix-2.7.0 | Lars Schneider | 2016-04-29 | 1 | -1/+1 |
| * | | | | | | | | t9824: fix broken &&-chain in a subshell | SZEDER Gábor | 2016-04-24 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'nf/mergetool-prompt' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | difftool/mergetool: make the form of yes/no questions consistentnf/mergetool-prompt | Nikola Forró | 2016-04-25 | 1 | -1/+1 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jk/push-client-deadlock-fix' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -6/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t5504: drop sigpipe=ok from push tests | Jeff King | 2016-04-20 | 1 | -6/+4 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'sb/mv-submodule-fix' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | mv: allow moving nested submodulessb/mv-submodule-fix | Stefan Beller | 2016-04-19 | 1 | -0/+16 |
| | |/ / / / / / / | |/| | | | | | | |