aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* add SWAP macroRené Scharfe2017-01-30
* Seventh batch for 2.12Junio C Hamano2017-01-23
* Merge branch 'ws/request-pull-code-cleanup'Junio C Hamano2017-01-23
|\
| * request-pull: drop old USAGE stuffWolfram Sang2017-01-15
* | Merge branch 'rh/diff-orderfile-doc'Junio C Hamano2017-01-23
|\ \
| * | diff: document the format of the -O (diff.orderFile) fileRichard Hansen2017-01-15
| * | diff: document behavior of relative diff.orderFileRichard Hansen2017-01-15
* | | Merge branch 'sb/cd-then-git-can-be-written-as-git-c'Junio C Hamano2017-01-23
|\ \ \
| * | | lib-submodule-update.sh: reduce use of subshell by using "git -C"Stefan Beller2017-01-13
* | | | Merge branch 'ad/bisect-terms'Junio C Hamano2017-01-23
|\ \ \ \
| * | | | Documentation/bisect: improve on (bad|new) and (good|bad)Christian Couder2017-01-13
* | | | | Merge branch 'sg/fix-versioncmp-with-common-suffix'Junio C Hamano2017-01-23
|\ \ \ \ \
| * | | | | versioncmp: generalize version sort suffix reorderingSZEDER Gábor2017-01-12
| * | | | | versioncmp: factor out helper for suffix matchingSZEDER Gábor2017-01-12
| * | | | | versioncmp: use earliest-longest contained suffix to determine sorting orderSZEDER Gábor2016-12-08
| * | | | | versioncmp: cope with common part overlapping with prerelease suffixSZEDER Gábor2016-12-08
| * | | | | versioncmp: pass full tagnames to swap_prereleases()SZEDER Gábor2016-12-08
| * | | | | t7004-tag: add version sort tests to show prerelease reordering issuesSZEDER Gábor2016-12-08
| * | | | | t7004-tag: use test_config helperSZEDER Gábor2016-12-08
| * | | | | t7004-tag: delete unnecessary tags with test_when_finishedSZEDER Gábor2016-12-08
* | | | | | Merge branch 'vn/diff-ihc-config'Junio C Hamano2017-01-23
|\ \ \ \ \ \
| * | | | | | diff: add interhunk context config optionVegard Nossum2017-01-12
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'sb/submodule-init'Junio C Hamano2017-01-23
|\ \ \ \ \ \
| * | | | | | submodule update --init: display correct path from submoduleStefan Beller2017-01-12
* | | | | | | Merge branch 'sb/submodule-embed-gitdir'Junio C Hamano2017-01-23
|\ \ \ \ \ \ \
| * | | | | | | submodule absorbgitdirs: mention in docstring helpStefan Beller2017-01-12
* | | | | | | | Merge branch 'sb/submodule-config-tests'Junio C Hamano2017-01-23
|\ \ \ \ \ \ \ \
| * | | | | | | | t7411: test lookup of uninitialized submodulesStefan Beller2017-01-12
| * | | | | | | | t7411: quote URLsStefan Beller2017-01-12
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/grep-e-could-be-extended-beyond-posix'Junio C Hamano2017-01-23
|\ \ \ \ \ \ \ \
| * | | | | | | | t7810: avoid assumption about invalid regex syntaxJeff King2017-01-11
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'bw/read-blob-data-does-not-modify-index-state'Junio C Hamano2017-01-23
|\ \ \ \ \ \ \ \
| * | | | | | | | index: improve constness for reading blob dataBrandon Williams2017-01-11
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Sixth batch for 2.12Junio C Hamano2017-01-18
* | | | | | | | Merge branch 'sb/remove-gitview'Junio C Hamano2017-01-18
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: git-gui browser does not default to HEADPhilip Oakley2017-01-13
| * | | | | | | | doc: gitk: add the upstream repo locationPhilip Oakley2017-01-13
| * | | | | | | | doc: gitk: remove gitview referencePhilip Oakley2017-01-13
| * | | | | | | | contrib: remove gitviewStefan Beller2017-01-07
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'js/asciidoctor-tweaks'Junio C Hamano2017-01-18
|\ \ \ \ \ \ \ \
| * | | | | | | | asciidoctor: fix user-manual to be built by `asciidoctor`마누엘2017-01-13
| * | | | | | | | giteveryday: unbreak rendering with AsciiDoctorJohannes Schindelin2017-01-07
* | | | | | | | | Merge branch 'sb/unpack-trees-cleanup'Junio C Hamano2017-01-18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | unpack-trees: factor progress setup out of check_updatesStefan Beller2017-01-10
| * | | | | | | | | unpack-trees: remove unneeded continueStefan Beller2017-01-10
| * | | | | | | | | unpack-trees: move checkout state into check_updatesStefan Beller2017-01-10
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'rh/mergetool-regression-fix'Junio C Hamano2017-01-18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mergetool: fix running in subdir when rerere enabledRichard Hansen2017-01-10
| * | | | | | | | | mergetool: take the "-O" out of $orderfileRichard Hansen2017-01-10
| * | | | | | | | | t7610: add test case for rerere+mergetool+subdir bugRichard Hansen2017-01-10