Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | run-command: add hint when a hook is ignored | Damien Marié | 2017-10-10 | 1 | -0/+41 |
* | Merge branch 'ar/request-pull-phrasofix' | Junio C Hamano | 2017-10-05 | 1 | -2/+2 |
|\ | |||||
| * | request-pull: capitalise "Git" to make it a proper noun | Ann T Ropea | 2017-10-03 | 1 | -2/+2 |
* | | Merge branch 'er/fast-import-dump-refs-on-checkpoint' | Junio C Hamano | 2017-10-05 | 1 | -0/+142 |
|\ \ | |||||
| * | | fast-import: checkpoint: dump branches/tags/marks even if object_count==0 | Eric Rannaud | 2017-09-29 | 1 | -0/+142 |
* | | | Merge branch 'mr/doc-negative-pathspec' | Junio C Hamano | 2017-10-03 | 1 | -1/+12 |
|\ \ \ | |||||
| * | | | docs: improve discoverability of exclude pathspec | Manav Rathi | 2017-09-25 | 1 | -1/+12 |
* | | | | Merge branch 'sb/submodule-diff-header-fix' | Junio C Hamano | 2017-10-03 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | submodule: correct error message for missing commits | Stefan Beller | 2017-09-28 | 1 | -1/+1 |
* | | | | | Merge branch 'sb/diff-color-move' | Junio C Hamano | 2017-10-03 | 6 | -0/+34 |
|\ \ \ \ \ | |||||
| * | | | | | diff: correct newline in summary for renamed files | Stefan Beller | 2017-09-28 | 6 | -0/+34 |
* | | | | | | Merge branch 'sb/test-submodule-update-config' | Junio C Hamano | 2017-10-03 | 1 | -0/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t7406: submodule.<name>.update command must not be run from .gitmodules | Stefan Beller | 2017-09-27 | 1 | -0/+8 |
* | | | | | | | 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-19 | 1 | -0/+215 |
| * | | | | | | | | branch: add test for -m renaming multiple config sections | Ævar Arnfjörð Bjarmason | 2017-06-19 | 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 needed | 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-28 | 1 | -1/+1 |
| * | | | | | | | | | t3415: test fixup with wrapped oneline | Johannes Schindelin | 2017-07-28 | 1 | -0/+14 |
| * | | | | | | | | | t3404: relax rebase.missingCommitsCheck tests | Johannes Schindelin | 2017-07-28 | 1 | -18/+4 |
| * | | | | | | | | | t3415: verify that an empty instructionFormat is handled as before | Johannes Schindelin | 2017-07-28 | 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 file | 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 remotes | 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.path | 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 patterns | 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 default | Jeff King | 2017-09-12 | 1 | -0/+48 |
* | | | | | | | | | | | | | Merge branch 'ks/test-readme-phrasofix' | Junio C Hamano | 2017-09-25 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |