Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | graph: use SWAP macrors/swap | René Scharfe | 2017-01-30 | 1 | -5/+1 |
* | diff: use SWAP macro | René Scharfe | 2017-01-30 | 2 | -5/+2 |
* | use SWAP macro | René Scharfe | 2017-01-30 | 11 | -39/+15 |
* | apply: use SWAP macro | René Scharfe | 2017-01-30 | 1 | -16/+7 |
* | add SWAP macro | René Scharfe | 2017-01-30 | 2 | -0/+38 |
* | Seventh batch for 2.12 | Junio C Hamano | 2017-01-23 | 1 | -0/+15 |
* | Merge branch 'ws/request-pull-code-cleanup' | Junio C Hamano | 2017-01-23 | 1 | -3/+0 |
|\ | |||||
| * | request-pull: drop old USAGE stuffws/request-pull-code-cleanup | Wolfram Sang | 2017-01-15 | 1 | -3/+0 |
* | | Merge branch 'rh/diff-orderfile-doc' | Junio C Hamano | 2017-01-23 | 2 | -5/+36 |
|\ \ | |||||
| * | | diff: document the format of the -O (diff.orderFile) filerh/diff-orderfile-doc | Richard Hansen | 2017-01-15 | 2 | -5/+34 |
| * | | diff: document behavior of relative diff.orderFile | Richard Hansen | 2017-01-15 | 1 | -0/+2 |
* | | | Merge branch 'sb/cd-then-git-can-be-written-as-git-c' | Junio C Hamano | 2017-01-23 | 1 | -4/+1 |
|\ \ \ | |||||
| * | | | lib-submodule-update.sh: reduce use of subshell by using "git -C"sb/cd-then-git-can-be-written-as-git-c | Stefan Beller | 2017-01-13 | 1 | -4/+1 |
* | | | | Merge branch 'ad/bisect-terms' | Junio C Hamano | 2017-01-23 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Documentation/bisect: improve on (bad|new) and (good|bad)ad/bisect-terms | Christian Couder | 2017-01-13 | 1 | -2/+2 |
* | | | | | Merge branch 'sg/fix-versioncmp-with-common-suffix' | Junio C Hamano | 2017-01-23 | 4 | -58/+221 |
|\ \ \ \ \ | |||||
| * | | | | | versioncmp: generalize version sort suffix reorderingsg/fix-versioncmp-with-common-suffix | SZEDER Gábor | 2017-01-12 | 4 | -13/+71 |
| * | | | | | versioncmp: factor out helper for suffix matching | SZEDER Gábor | 2017-01-12 | 1 | -25/+39 |
| * | | | | | versioncmp: use earliest-longest contained suffix to determine sorting order | SZEDER Gábor | 2016-12-08 | 3 | -10/+60 |
| * | | | | | versioncmp: cope with common part overlapping with prerelease suffix | SZEDER Gábor | 2016-12-08 | 3 | -11/+34 |
| * | | | | | versioncmp: pass full tagnames to swap_prereleases() | SZEDER Gábor | 2016-12-08 | 1 | -16/+13 |
| * | | | | | t7004-tag: add version sort tests to show prerelease reordering issues | SZEDER Gábor | 2016-12-08 | 1 | -6/+30 |
| * | | | | | t7004-tag: use test_config helper | SZEDER Gábor | 2016-12-08 | 1 | -13/+10 |
| * | | | | | t7004-tag: delete unnecessary tags with test_when_finished | SZEDER Gábor | 2016-12-08 | 1 | -1/+1 |
* | | | | | | Merge branch 'vn/diff-ihc-config' | Junio C Hamano | 2017-01-23 | 4 | -1/+42 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: add interhunk context config optionvn/diff-ihc-config | Vegard Nossum | 2017-01-12 | 4 | -1/+42 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'sb/submodule-init' | Junio C Hamano | 2017-01-23 | 3 | -7/+25 |
|\ \ \ \ \ \ | |||||
| * | | | | | | submodule update --init: display correct path from submodulesb/submodule-init | Stefan Beller | 2017-01-12 | 3 | -7/+25 |
* | | | | | | | Merge branch 'sb/submodule-embed-gitdir' | Junio C Hamano | 2017-01-23 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | submodule absorbgitdirs: mention in docstring helpsb/submodule-embed-gitdir | Stefan Beller | 2017-01-12 | 1 | -1/+2 |
* | | | | | | | | Merge branch 'sb/submodule-config-tests' | Junio C Hamano | 2017-01-23 | 1 | -2/+23 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t7411: test lookup of uninitialized submodulessb/submodule-config-tests | Stefan Beller | 2017-01-12 | 1 | -0/+21 |
| * | | | | | | | | t7411: quote URLs | Stefan Beller | 2017-01-12 | 1 | -2/+2 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/grep-e-could-be-extended-beyond-posix' | Junio C Hamano | 2017-01-23 | 1 | -11/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t7810: avoid assumption about invalid regex syntaxjk/grep-e-could-be-extended-beyond-posix | Jeff King | 2017-01-11 | 1 | -11/+15 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'bw/read-blob-data-does-not-modify-index-state' | Junio C Hamano | 2017-01-23 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | index: improve constness for reading blob databw/read-blob-data-does-not-modify-index-state | Brandon Williams | 2017-01-11 | 2 | -2/+3 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Sixth batch for 2.12 | Junio C Hamano | 2017-01-18 | 1 | -0/+64 |
* | | | | | | | | Merge branch 'sb/remove-gitview' | Junio C Hamano | 2017-01-18 | 4 | -1369/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | doc: git-gui browser does not default to HEADsb/remove-gitview | Philip Oakley | 2017-01-13 | 1 | -1/+1 |
| * | | | | | | | | doc: gitk: add the upstream repo location | Philip Oakley | 2017-01-13 | 1 | -2/+8 |
| * | | | | | | | | doc: gitk: remove gitview reference | Philip Oakley | 2017-01-13 | 1 | -4/+0 |
| * | | | | | | | | contrib: remove gitview | Stefan Beller | 2017-01-07 | 2 | -1362/+0 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/asciidoctor-tweaks' | Junio C Hamano | 2017-01-18 | 3 | -9/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | asciidoctor: fix user-manual to be built by `asciidoctor`js/asciidoctor-tweaks | 마누엘 | 2017-01-13 | 2 | -1/+9 |
| * | | | | | | | | giteveryday: unbreak rendering with AsciiDoctor | Johannes Schindelin | 2017-01-07 | 1 | -8/+9 |
* | | | | | | | | | Merge branch 'sb/unpack-trees-cleanup' | Junio C Hamano | 2017-01-18 | 1 | -23/+30 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | unpack-trees: factor progress setup out of check_updatessb/unpack-trees-cleanup | Stefan Beller | 2017-01-10 | 1 | -12/+20 |
| * | | | | | | | | | unpack-trees: remove unneeded continue | Stefan Beller | 2017-01-10 | 1 | -1/+0 |
| * | | | | | | | | | unpack-trees: move checkout state into check_updates | Stefan Beller | 2017-01-10 | 1 | -12/+12 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | |