Commit message (Expand) | Author | Age | |
---|---|---|---|
* | add SWAP macro | René Scharfe | 2017-01-30 |
* | Seventh batch for 2.12 | Junio C Hamano | 2017-01-23 |
* | Merge branch 'ws/request-pull-code-cleanup' | Junio C Hamano | 2017-01-23 |
|\ | |||
| * | request-pull: drop old USAGE stuff | Wolfram Sang | 2017-01-15 |
* | | Merge branch 'rh/diff-orderfile-doc' | Junio C Hamano | 2017-01-23 |
|\ \ | |||
| * | | diff: document the format of the -O (diff.orderFile) file | Richard Hansen | 2017-01-15 |
| * | | diff: document behavior of relative diff.orderFile | Richard Hansen | 2017-01-15 |
* | | | Merge branch 'sb/cd-then-git-can-be-written-as-git-c' | Junio C Hamano | 2017-01-23 |
|\ \ \ | |||
| * | | | lib-submodule-update.sh: reduce use of subshell by using "git -C" | Stefan Beller | 2017-01-13 |
* | | | | Merge branch 'ad/bisect-terms' | Junio C Hamano | 2017-01-23 |
|\ \ \ \ | |||
| * | | | | Documentation/bisect: improve on (bad|new) and (good|bad) | Christian Couder | 2017-01-13 |
* | | | | | Merge branch 'sg/fix-versioncmp-with-common-suffix' | Junio C Hamano | 2017-01-23 |
|\ \ \ \ \ | |||
| * | | | | | versioncmp: generalize version sort suffix reordering | SZEDER Gábor | 2017-01-12 |
| * | | | | | versioncmp: factor out helper for suffix matching | SZEDER Gábor | 2017-01-12 |
| * | | | | | versioncmp: use earliest-longest contained suffix to determine sorting order | SZEDER Gábor | 2016-12-08 |
| * | | | | | versioncmp: cope with common part overlapping with prerelease suffix | SZEDER Gábor | 2016-12-08 |
| * | | | | | versioncmp: pass full tagnames to swap_prereleases() | SZEDER Gábor | 2016-12-08 |
| * | | | | | t7004-tag: add version sort tests to show prerelease reordering issues | SZEDER Gábor | 2016-12-08 |
| * | | | | | t7004-tag: use test_config helper | SZEDER Gábor | 2016-12-08 |
| * | | | | | t7004-tag: delete unnecessary tags with test_when_finished | SZEDER Gábor | 2016-12-08 |
* | | | | | | Merge branch 'vn/diff-ihc-config' | Junio C Hamano | 2017-01-23 |
|\ \ \ \ \ \ | |||
| * | | | | | | diff: add interhunk context config option | Vegard Nossum | 2017-01-12 |
| | |_|/ / / | |/| | | | | |||
* | | | | | | Merge branch 'sb/submodule-init' | Junio C Hamano | 2017-01-23 |
|\ \ \ \ \ \ | |||
| * | | | | | | submodule update --init: display correct path from submodule | Stefan Beller | 2017-01-12 |
* | | | | | | | Merge branch 'sb/submodule-embed-gitdir' | Junio C Hamano | 2017-01-23 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | submodule absorbgitdirs: mention in docstring help | Stefan Beller | 2017-01-12 |
* | | | | | | | | Merge branch 'sb/submodule-config-tests' | Junio C Hamano | 2017-01-23 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | t7411: test lookup of uninitialized submodules | Stefan Beller | 2017-01-12 |
| * | | | | | | | | t7411: quote URLs | Stefan Beller | 2017-01-12 |
| | |_|/ / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jk/grep-e-could-be-extended-beyond-posix' | Junio C Hamano | 2017-01-23 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | t7810: avoid assumption about invalid regex syntax | Jeff King | 2017-01-11 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||
* | | | | | | | | Merge branch 'bw/read-blob-data-does-not-modify-index-state' | Junio C Hamano | 2017-01-23 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | index: improve constness for reading blob data | Brandon Williams | 2017-01-11 |
| | |/ / / / / / | |/| | | | | | | |||
* | | | | | | | | Sixth batch for 2.12 | Junio C Hamano | 2017-01-18 |
* | | | | | | | | Merge branch 'sb/remove-gitview' | Junio C Hamano | 2017-01-18 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | doc: git-gui browser does not default to HEAD | Philip Oakley | 2017-01-13 |
| * | | | | | | | | doc: gitk: add the upstream repo location | Philip Oakley | 2017-01-13 |
| * | | | | | | | | doc: gitk: remove gitview reference | Philip Oakley | 2017-01-13 |
| * | | | | | | | | contrib: remove gitview | Stefan Beller | 2017-01-07 |
| | |/ / / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'js/asciidoctor-tweaks' | Junio C Hamano | 2017-01-18 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | asciidoctor: fix user-manual to be built by `asciidoctor` | 마누엘 | 2017-01-13 |
| * | | | | | | | | giteveryday: unbreak rendering with AsciiDoctor | Johannes Schindelin | 2017-01-07 |
* | | | | | | | | | Merge branch 'sb/unpack-trees-cleanup' | Junio C Hamano | 2017-01-18 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | unpack-trees: factor progress setup out of check_updates | Stefan Beller | 2017-01-10 |
| * | | | | | | | | | unpack-trees: remove unneeded continue | Stefan Beller | 2017-01-10 |
| * | | | | | | | | | unpack-trees: move checkout state into check_updates | Stefan Beller | 2017-01-10 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'rh/mergetool-regression-fix' | Junio C Hamano | 2017-01-18 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | mergetool: fix running in subdir when rerere enabled | Richard Hansen | 2017-01-10 |
| * | | | | | | | | | mergetool: take the "-O" out of $orderfile | Richard Hansen | 2017-01-10 |
| * | | | | | | | | | t7610: add test case for rerere+mergetool+subdir bug | Richard Hansen | 2017-01-10 |