Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge branch 'mr/doc-negative-pathspec' | Junio C Hamano | 2017-10-03 | 5 | -2/+24 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | docs: improve discoverability of exclude pathspecmr/doc-negative-pathspec | Manav Rathi | 2017-09-25 | 5 | -2/+24 | |
* | | | | | | | | | Merge branch 'sb/submodule-diff-header-fix' | Junio C Hamano | 2017-10-03 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | submodule: correct error message for missing commitssb/submodule-diff-header-fix | Stefan Beller | 2017-09-28 | 2 | -2/+2 | |
* | | | | | | | | | | Merge branch 'sb/diff-color-move' | Junio C Hamano | 2017-10-03 | 7 | -0/+35 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | diff: correct newline in summary for renamed files | Stefan Beller | 2017-09-28 | 7 | -0/+35 | |
* | | | | | | | | | | | 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 .gitmodulessb/test-submodule-update-config | Stefan Beller | 2017-09-27 | 1 | -0/+8 | |
* | | | | | | | | | | | | Merge branch 'jk/validate-headref-fix' | Junio C Hamano | 2017-10-03 | 1 | -11/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | validate_headref: use get_oid_hex for detached HEADsjk/validate-headref-fix | Jeff King | 2017-09-27 | 1 | -2/+2 | |
| * | | | | | | | | | | | | validate_headref: use skip_prefix for symref parsing | Jeff King | 2017-09-27 | 1 | -9/+6 | |
| * | | | | | | | | | | | | validate_headref: NUL-terminate HEAD buffer | Jeff King | 2017-09-27 | 1 | -0/+4 | |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jk/read-in-full' | Junio C Hamano | 2017-10-03 | 10 | -17/+55 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | worktree: check the result of read_in_full()jk/read-in-full | Jeff King | 2017-09-27 | 1 | -1/+18 | |
| * | | | | | | | | | | | | worktree: use xsize_t to access file size | Jeff King | 2017-09-27 | 1 | -2/+3 | |
| * | | | | | | | | | | | | distinguish error versus short read from read_in_full() | Jeff King | 2017-09-27 | 3 | -4/+16 | |
| * | | | | | | | | | | | | avoid looking at errno for short read_in_full() returns | Jeff King | 2017-09-27 | 2 | -4/+14 | |
| * | | | | | | | | | | | | prefer "!=" when checking read_in_full() result | Jeff King | 2017-09-27 | 3 | -3/+3 | |
| * | | | | | | | | | | | | notes-merge: drop dead zero-write code | Jeff King | 2017-09-26 | 1 | -2/+0 | |
| * | | | | | | | | | | | | files-backend: prefer "0" for write_in_full() error check | Jeff King | 2017-09-26 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge branch 'jk/no-optional-locks' | Junio C Hamano | 2017-10-03 | 6 | -1/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | git: add --no-optional-locks option | Jeff King | 2017-09-27 | 6 | -1/+41 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'hn/string-list-doc' | Junio C Hamano | 2017-10-03 | 2 | -239/+162 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | string-list.h: move documentation from Documentation/api/ into header | Han-Wen Nienhuys | 2017-09-27 | 2 | -239/+162 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'hn/path-ownership-comment' | Junio C Hamano | 2017-10-03 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | read_gitfile_gently: clarify return value ownership.hn/path-ownership-comment | Han-Wen Nienhuys | 2017-09-27 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | real_path: clarify return value ownership | Han-Wen Nienhuys | 2017-09-27 | 1 | -0/+4 | |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'hn/submodule-comment' | Junio C Hamano | 2017-10-03 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | submodule.c: describe submodule_to_gitdir() in a new commenthn/submodule-comment | Han-Wen Nienhuys | 2017-09-26 | 1 | -0/+4 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'sd/branch-copy' | Junio C Hamano | 2017-10-03 | 10 | -48/+478 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | branch: fix "copy" to never touch HEAD | Junio C Hamano | 2017-09-24 | 2 | -11/+8 | |
| * | | | | | | | | | | | | | branch: add a --copy (-c) option to go with --move (-m) | Sahil Dua | 2017-06-18 | 9 | -46/+424 | |
| * | | | | | | | | | | | | | branch: add test for -m renaming multiple config sections | Ævar Arnfjörð Bjarmason | 2017-06-18 | 1 | -0/+41 | |
| * | | | | | | | | | | | | | config: create a function to format section headers | Sahil Dua | 2017-06-18 | 1 | -2/+11 | |
* | | | | | | | | | | | | | | Merge branch 'bc/rev-parse-parseopt-fix' | Junio C Hamano | 2017-10-03 | 6 | -10/+139 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | parse-options: only insert newline in help text if neededbc/rev-parse-parseopt-fix | Brandon Casey | 2017-09-25 | 2 | -4/+10 | |
| * | | | | | | | | | | | | | | parse-options: write blank line to correct output stream | Brandon Casey | 2017-09-25 | 3 | -5/+5 | |
| * | | | | | | | | | | | | | | t0040,t1502: Demonstrate parse_options bugs | Brandon Casey | 2017-09-25 | 3 | -3/+107 | |
| * | | | | | | | | | | | | | | git-rebase: don't ignore unexpected command line arguments | Brandon Casey | 2017-09-19 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | rev-parse parseopt: interpret any whitespace as start of help text | Brandon Casey | 2017-09-19 | 2 | -3/+11 | |
| * | | | | | | | | | | | | | | rev-parse parseopt: do not search help text for flag chars | Brandon Casey | 2017-09-19 | 2 | -4/+6 | |
| * | | | | | | | | | | | | | | 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 | 7 | -360/+647 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | rebase -i: rearrange fixup/squash lines using the rebase--helper | Johannes Schindelin | 2017-07-27 | 6 | -98/+213 | |
| * | | | | | | | | | | | | | t3415: test fixup with wrapped oneline | Johannes Schindelin | 2017-07-27 | 1 | -0/+14 | |
| * | | | | | | | | | | | | | rebase -i: skip unnecessary picks using the rebase--helper | Johannes Schindelin | 2017-07-27 | 4 | -39/+116 | |
| * | | | | | | | | | | | | | rebase -i: check for missing commits in the rebase--helper | Johannes Schindelin | 2017-07-27 | 4 | -160/+134 | |
| * | | | | | | | | | | | | | t3404: relax rebase.missingCommitsCheck tests | Johannes Schindelin | 2017-07-27 | 1 | -18/+4 | |
| * | | | | | | | | | | | | | rebase -i: also expand/collapse the SHA-1s via the rebase--helper | Johannes Schindelin | 2017-07-27 | 4 | -26/+70 | |
| * | | | | | | | | | | | | | rebase -i: do not invent onelines when expanding/collapsing SHA-1s | Johannes Schindelin | 2017-07-27 | 1 | -1/+6 |