Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/no-optional-locks' | Junio C Hamano | 2017-10-03 | 1 | -0/+10 |
|\ | |||||
| * | git: add --no-optional-locks option | Jeff King | 2017-09-27 | 1 | -0/+10 |
* | | Merge branch 'sd/branch-copy' | Junio C Hamano | 2017-10-03 | 1 | -0/+256 |
|\ \ | |||||
| * | | branch: fix "copy" to never touch HEAD | Junio C Hamano | 2017-09-24 | 1 | -5/+5 |
| * | | branch: add a --copy (-c) option to go with --move (-m) | Sahil Dua | 2017-06-18 | 1 | -0/+215 |
| * | | branch: add test for -m renaming multiple config sections | Ævar Arnfjörð Bjarmason | 2017-06-18 | 1 | -0/+41 |
* | | | Merge branch 'bc/rev-parse-parseopt-fix' | Junio C Hamano | 2017-10-03 | 3 | -3/+113 |
|\ \ \ | |||||
| * | | | parse-options: only insert newline in help text if neededbc/rev-parse-parseopt-fix | Brandon Casey | 2017-09-25 | 1 | -2/+2 |
| * | | | parse-options: write blank line to correct output stream | Brandon Casey | 2017-09-25 | 2 | -4/+4 |
| * | | | t0040,t1502: Demonstrate parse_options bugs | Brandon Casey | 2017-09-25 | 3 | -3/+107 |
| * | | | rev-parse parseopt: interpret any whitespace as start of help text | Brandon Casey | 2017-09-19 | 1 | -1/+1 |
| * | | | rev-parse parseopt: do not search help text for flag chars | Brandon Casey | 2017-09-19 | 1 | -2/+2 |
| * | | | t1502: demonstrate rev-parse --parseopt option mis-parsing | Brandon Casey | 2017-09-19 | 1 | -6/+12 |
* | | | | Merge branch 'js/rebase-i-final' | Junio C Hamano | 2017-10-03 | 2 | -19/+31 |
|\ \ \ \ | |||||
| * | | | | rebase -i: rearrange fixup/squash lines using the rebase--helper | Johannes Schindelin | 2017-07-27 | 1 | -1/+1 |
| * | | | | t3415: test fixup with wrapped oneline | Johannes Schindelin | 2017-07-27 | 1 | -0/+14 |
| * | | | | t3404: relax rebase.missingCommitsCheck tests | Johannes Schindelin | 2017-07-27 | 1 | -18/+4 |
| * | | | | t3415: verify that an empty instructionFormat is handled as before | Johannes Schindelin | 2017-07-27 | 1 | -0/+12 |
* | | | | | Merge branch 'jt/fast-export-copy-modify-fix' | Junio C Hamano | 2017-09-29 | 1 | -1/+19 |
|\ \ \ \ \ | |||||
| * | | | | | fast-export: do not copy from modified filejt/fast-export-copy-modify-fix | Jonathan Tan | 2017-09-21 | 1 | -1/+19 |
* | | | | | | Merge branch 'mk/describe-match-with-all' | Junio C Hamano | 2017-09-29 | 1 | -0/+27 |
|\ \ \ \ \ \ | |||||
| * | | | | | | describe: teach --match to handle branches and remotesmk/describe-match-with-all | Max Kirillov | 2017-09-20 | 1 | -0/+27 |
| * | | | | | | Merge branch 'jk/describe-omit-some-refs' into mk/describe-match-with-all | Junio C Hamano | 2017-09-20 | 1 | -1/+5 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'jk/fallthrough' | Junio C Hamano | 2017-09-28 | 1 | -21/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | test-line-buffer: simplify command parsing | Jeff King | 2017-09-22 | 1 | -21/+11 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jk/diff-blob' | Junio C Hamano | 2017-09-28 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | cat-file: handle NULL object_context.pathjk/diff-blob | Jeff King | 2017-09-22 | 1 | -0/+5 |
* | | | | | | | | | Merge branch 'jk/describe-omit-some-refs' | Junio C Hamano | 2017-09-28 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | describe: fix matching to actually match all patternsjk/describe-omit-some-refs | Max Kirillov | 2017-09-17 | 1 | -1/+5 |
* | | | | | | | | | Sync with 2.14.2 | Junio C Hamano | 2017-09-26 | 1 | -0/+48 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Sync with 2.13.6 | Junio C Hamano | 2017-09-22 | 1 | -0/+48 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| | * | | | | | | | Sync with 2.12.5 | Junio C Hamano | 2017-09-22 | 1 | -0/+48 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Sync with 2.11.4 | Junio C Hamano | 2017-09-22 | 1 | -0/+48 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Sync with 2.10.5 | Junio C Hamano | 2017-09-22 | 1 | -0/+48 |
| | | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / / | | | | |/| | | | | | | |||||
| | | | | * | | | | | | Merge branch 'jk/git-shell-drop-cvsserver' into maint-2.10 | Junio C Hamano | 2017-09-22 | 1 | -0/+48 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | | * | | | | | | shell: drop git-cvsserver support by defaultjk/git-shell-drop-cvsserver | Jeff King | 2017-09-12 | 1 | -0/+48 |
* | | | | | | | | | | | | Merge branch 'ks/test-readme-phrasofix' | Junio C Hamano | 2017-09-25 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | t/README: fix typo and grammatically improve a sentenceks/test-readme-phrasofix | Kaartic Sivaraam | 2017-09-19 | 1 | -3/+3 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'ow/rev-parse-is-shallow-repo' | Junio C Hamano | 2017-09-25 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | rev-parse: rev-parse: add --is-shallow-repositoryow/rev-parse-is-shallow-repo | Øystein Walle | 2017-09-19 | 1 | -0/+15 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'rj/test-ulimit-on-windows' | Junio C Hamano | 2017-09-25 | 5 | -40/+42 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | t9010-*.sh: skip all tests if the PIPE prereq is missingrj/test-ulimit-on-windows | Ramsay Jones | 2017-09-19 | 1 | -27/+28 |
| * | | | | | | | | | | | | test-lib: use more compact expression in PIPE prerequisite | Ramsay Jones | 2017-09-19 | 1 | -8/+2 |
| * | | | | | | | | | | | | test-lib: don't use ulimit in test prerequisites on cygwin | Ramsay Jones | 2017-09-15 | 4 | -5/+12 |
* | | | | | | | | | | | | | Merge branch 'tb/test-lint-echo-e' | Junio C Hamano | 2017-09-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | test-lint: echo -e (or -E) is not portabletb/test-lint-echo-e | Torsten Bögershausen | 2017-09-21 | 1 | -1/+1 |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'hv/mv-nested-submodules-test' | Junio C Hamano | 2017-09-25 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | add test for bug in git-mv for recursive submoduleshv/mv-nested-submodules-test | Heiko Voigt | 2017-09-17 | 1 | -0/+25 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'rs/archive-excluded-directory' | Junio C Hamano | 2017-09-25 | 3 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | archive: don't add empty directories to archivesrs/archive-excluded-directory | René Scharfe | 2017-09-14 | 3 | -4/+4 |