summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'mr/doc-negative-pathspec'Junio C Hamano2017-10-035-2/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | docs: improve discoverability of exclude pathspecmr/doc-negative-pathspecManav Rathi2017-09-255-2/+24
* | | | | | | | | Merge branch 'sb/submodule-diff-header-fix'Junio C Hamano2017-10-032-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule: correct error message for missing commitssb/submodule-diff-header-fixStefan Beller2017-09-282-2/+2
* | | | | | | | | | Merge branch 'sb/diff-color-move'Junio C Hamano2017-10-037-0/+35
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff: correct newline in summary for renamed filesStefan Beller2017-09-287-0/+35
* | | | | | | | | | | Merge branch 'sb/test-submodule-update-config'Junio C Hamano2017-10-031-0/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t7406: submodule.<name>.update command must not be run from .gitmodulessb/test-submodule-update-configStefan Beller2017-09-271-0/+8
* | | | | | | | | | | | Merge branch 'jk/validate-headref-fix'Junio C Hamano2017-10-031-11/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | validate_headref: use get_oid_hex for detached HEADsjk/validate-headref-fixJeff King2017-09-271-2/+2
| * | | | | | | | | | | | validate_headref: use skip_prefix for symref parsingJeff King2017-09-271-9/+6
| * | | | | | | | | | | | validate_headref: NUL-terminate HEAD bufferJeff King2017-09-271-0/+4
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/read-in-full'Junio C Hamano2017-10-0310-17/+55
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | worktree: check the result of read_in_full()jk/read-in-fullJeff King2017-09-271-1/+18
| * | | | | | | | | | | | worktree: use xsize_t to access file sizeJeff King2017-09-271-2/+3
| * | | | | | | | | | | | distinguish error versus short read from read_in_full()Jeff King2017-09-273-4/+16
| * | | | | | | | | | | | avoid looking at errno for short read_in_full() returnsJeff King2017-09-272-4/+14
| * | | | | | | | | | | | prefer "!=" when checking read_in_full() resultJeff King2017-09-273-3/+3
| * | | | | | | | | | | | notes-merge: drop dead zero-write codeJeff King2017-09-261-2/+0
| * | | | | | | | | | | | files-backend: prefer "0" for write_in_full() error checkJeff King2017-09-261-1/+1
* | | | | | | | | | | | | Merge branch 'jk/no-optional-locks'Junio C Hamano2017-10-036-1/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git: add --no-optional-locks optionJeff King2017-09-276-1/+41
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'hn/string-list-doc'Junio C Hamano2017-10-032-239/+162
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | string-list.h: move documentation from Documentation/api/ into headerHan-Wen Nienhuys2017-09-272-239/+162
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'hn/path-ownership-comment'Junio C Hamano2017-10-032-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | read_gitfile_gently: clarify return value ownership.hn/path-ownership-commentHan-Wen Nienhuys2017-09-271-1/+2
| * | | | | | | | | | | | | real_path: clarify return value ownershipHan-Wen Nienhuys2017-09-271-0/+4
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'hn/submodule-comment'Junio C Hamano2017-10-031-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | submodule.c: describe submodule_to_gitdir() in a new commenthn/submodule-commentHan-Wen Nienhuys2017-09-261-0/+4
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'sd/branch-copy'Junio C Hamano2017-10-0310-48/+478
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | branch: fix "copy" to never touch HEADJunio C Hamano2017-09-242-11/+8
| * | | | | | | | | | | | | branch: add a --copy (-c) option to go with --move (-m)Sahil Dua2017-06-189-46/+424
| * | | | | | | | | | | | | branch: add test for -m renaming multiple config sectionsÆvar Arnfjörð Bjarmason2017-06-181-0/+41
| * | | | | | | | | | | | | config: create a function to format section headersSahil Dua2017-06-181-2/+11
* | | | | | | | | | | | | | Merge branch 'bc/rev-parse-parseopt-fix'Junio C Hamano2017-10-036-10/+139
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | parse-options: only insert newline in help text if neededbc/rev-parse-parseopt-fixBrandon Casey2017-09-252-4/+10
| * | | | | | | | | | | | | | parse-options: write blank line to correct output streamBrandon Casey2017-09-253-5/+5
| * | | | | | | | | | | | | | t0040,t1502: Demonstrate parse_options bugsBrandon Casey2017-09-253-3/+107
| * | | | | | | | | | | | | | git-rebase: don't ignore unexpected command line argumentsBrandon Casey2017-09-191-0/+3
| * | | | | | | | | | | | | | rev-parse parseopt: interpret any whitespace as start of help textBrandon Casey2017-09-192-3/+11
| * | | | | | | | | | | | | | rev-parse parseopt: do not search help text for flag charsBrandon Casey2017-09-192-4/+6
| * | | | | | | | | | | | | | t1502: demonstrate rev-parse --parseopt option mis-parsingBrandon Casey2017-09-191-6/+12
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-037-360/+647
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin2017-07-276-98/+213
| * | | | | | | | | | | | | t3415: test fixup with wrapped onelineJohannes Schindelin2017-07-271-0/+14
| * | | | | | | | | | | | | rebase -i: skip unnecessary picks using the rebase--helperJohannes Schindelin2017-07-274-39/+116
| * | | | | | | | | | | | | rebase -i: check for missing commits in the rebase--helperJohannes Schindelin2017-07-274-160/+134
| * | | | | | | | | | | | | t3404: relax rebase.missingCommitsCheck testsJohannes Schindelin2017-07-271-18/+4
| * | | | | | | | | | | | | rebase -i: also expand/collapse the SHA-1s via the rebase--helperJohannes Schindelin2017-07-274-26/+70
| * | | | | | | | | | | | | rebase -i: do not invent onelines when expanding/collapsing SHA-1sJohannes Schindelin2017-07-271-1/+6