summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* graph: use SWAP macrors/swapRené Scharfe2017-01-301-5/+1
* diff: use SWAP macroRené Scharfe2017-01-302-5/+2
* use SWAP macroRené Scharfe2017-01-3011-39/+15
* apply: use SWAP macroRené Scharfe2017-01-301-16/+7
* add SWAP macroRené Scharfe2017-01-302-0/+38
* Seventh batch for 2.12Junio C Hamano2017-01-231-0/+15
* Merge branch 'ws/request-pull-code-cleanup'Junio C Hamano2017-01-231-3/+0
|\
| * request-pull: drop old USAGE stuffws/request-pull-code-cleanupWolfram Sang2017-01-151-3/+0
* | Merge branch 'rh/diff-orderfile-doc'Junio C Hamano2017-01-232-5/+36
|\ \
| * | diff: document the format of the -O (diff.orderFile) filerh/diff-orderfile-docRichard Hansen2017-01-152-5/+34
| * | diff: document behavior of relative diff.orderFileRichard Hansen2017-01-151-0/+2
* | | Merge branch 'sb/cd-then-git-can-be-written-as-git-c'Junio C Hamano2017-01-231-4/+1
|\ \ \
| * | | lib-submodule-update.sh: reduce use of subshell by using "git -C"sb/cd-then-git-can-be-written-as-git-cStefan Beller2017-01-131-4/+1
* | | | Merge branch 'ad/bisect-terms'Junio C Hamano2017-01-231-2/+2
|\ \ \ \
| * | | | Documentation/bisect: improve on (bad|new) and (good|bad)ad/bisect-termsChristian Couder2017-01-131-2/+2
* | | | | Merge branch 'sg/fix-versioncmp-with-common-suffix'Junio C Hamano2017-01-234-58/+221
|\ \ \ \ \
| * | | | | versioncmp: generalize version sort suffix reorderingsg/fix-versioncmp-with-common-suffixSZEDER Gábor2017-01-124-13/+71
| * | | | | versioncmp: factor out helper for suffix matchingSZEDER Gábor2017-01-121-25/+39
| * | | | | versioncmp: use earliest-longest contained suffix to determine sorting orderSZEDER Gábor2016-12-083-10/+60
| * | | | | versioncmp: cope with common part overlapping with prerelease suffixSZEDER Gábor2016-12-083-11/+34
| * | | | | versioncmp: pass full tagnames to swap_prereleases()SZEDER Gábor2016-12-081-16/+13
| * | | | | t7004-tag: add version sort tests to show prerelease reordering issuesSZEDER Gábor2016-12-081-6/+30
| * | | | | t7004-tag: use test_config helperSZEDER Gábor2016-12-081-13/+10
| * | | | | t7004-tag: delete unnecessary tags with test_when_finishedSZEDER Gábor2016-12-081-1/+1
* | | | | | Merge branch 'vn/diff-ihc-config'Junio C Hamano2017-01-234-1/+42
|\ \ \ \ \ \
| * | | | | | diff: add interhunk context config optionvn/diff-ihc-configVegard Nossum2017-01-124-1/+42
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'sb/submodule-init'Junio C Hamano2017-01-233-7/+25
|\ \ \ \ \ \
| * | | | | | submodule update --init: display correct path from submodulesb/submodule-initStefan Beller2017-01-123-7/+25
* | | | | | | Merge branch 'sb/submodule-embed-gitdir'Junio C Hamano2017-01-231-1/+2
|\ \ \ \ \ \ \
| * | | | | | | submodule absorbgitdirs: mention in docstring helpsb/submodule-embed-gitdirStefan Beller2017-01-121-1/+2
* | | | | | | | Merge branch 'sb/submodule-config-tests'Junio C Hamano2017-01-231-2/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | t7411: test lookup of uninitialized submodulessb/submodule-config-testsStefan Beller2017-01-121-0/+21
| * | | | | | | | t7411: quote URLsStefan Beller2017-01-121-2/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/grep-e-could-be-extended-beyond-posix'Junio C Hamano2017-01-231-11/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | t7810: avoid assumption about invalid regex syntaxjk/grep-e-could-be-extended-beyond-posixJeff King2017-01-111-11/+15
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'bw/read-blob-data-does-not-modify-index-state'Junio C Hamano2017-01-232-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | index: improve constness for reading blob databw/read-blob-data-does-not-modify-index-stateBrandon Williams2017-01-112-2/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Sixth batch for 2.12Junio C Hamano2017-01-181-0/+64
* | | | | | | | Merge branch 'sb/remove-gitview'Junio C Hamano2017-01-184-1369/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: git-gui browser does not default to HEADsb/remove-gitviewPhilip Oakley2017-01-131-1/+1
| * | | | | | | | doc: gitk: add the upstream repo locationPhilip Oakley2017-01-131-2/+8
| * | | | | | | | doc: gitk: remove gitview referencePhilip Oakley2017-01-131-4/+0
| * | | | | | | | contrib: remove gitviewStefan Beller2017-01-072-1362/+0
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'js/asciidoctor-tweaks'Junio C Hamano2017-01-183-9/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | asciidoctor: fix user-manual to be built by `asciidoctor`js/asciidoctor-tweaks마누엘2017-01-132-1/+9
| * | | | | | | | giteveryday: unbreak rendering with AsciiDoctorJohannes Schindelin2017-01-071-8/+9
* | | | | | | | | Merge branch 'sb/unpack-trees-cleanup'Junio C Hamano2017-01-181-23/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | unpack-trees: factor progress setup out of check_updatessb/unpack-trees-cleanupStefan Beller2017-01-101-12/+20
| * | | | | | | | | unpack-trees: remove unneeded continueStefan Beller2017-01-101-1/+0
| * | | | | | | | | unpack-trees: move checkout state into check_updatesStefan Beller2017-01-101-12/+12
| | |_|_|_|_|_|_|/ | |/| | | | | | |