Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | verify-tag: drop signal.h include | Jeff King | 2019-06-19 | 2 | -2/+0 |
* | Merge branch 'js/rebase-config-bitfix' | Junio C Hamano | 2019-05-30 | 1 | -1/+1 |
|\ | |||||
| * | rebase: replace incorrect logical negation by correct bitwise one | Johannes Schindelin | 2019-05-28 | 1 | -1/+1 |
* | | Merge branch 'js/difftool-no-index' | Junio C Hamano | 2019-05-19 | 1 | -1/+2 |
|\ \ | |||||
| * | | difftool --no-index: error out on --dir-diff (and don't crash) | Johannes Schindelin | 2019-05-09 | 1 | -1/+2 |
* | | | Merge branch 'ds/midx-too-many-packs' | Junio C Hamano | 2019-05-19 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | midx: pass a repository pointer | Derrick Stolee | 2019-05-07 | 2 | -2/+2 |
* | | | | Merge branch 'en/unicode-in-refnames' | Junio C Hamano | 2019-05-19 | 2 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | Honor core.precomposeUnicode in more places | Elijah Newren | 2019-04-26 | 2 | -0/+5 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'dl/difftool-mergetool' | Junio C Hamano | 2019-05-19 | 1 | -8/+5 |
|\ \ \ \ | |||||
| * | | | | difftool: fallback on merge.guitool | Denton Liu | 2019-05-13 | 1 | -8/+2 |
| * | | | | difftool: make --gui, --tool and --extcmd mutually exclusive | Denton Liu | 2019-05-13 | 1 | -0/+3 |
* | | | | | Merge branch 'nd/parse-options-aliases' | Junio C Hamano | 2019-05-19 | 1 | -4/+1 |
|\ \ \ \ \ | |||||
| * | | | | | parse-options: don't emit "ambiguous option" for aliases | Nguyễn Thái Ngọc Duy | 2019-05-07 | 1 | -4/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'nd/submodule-helper-incomplete-line-fix' | Junio C Hamano | 2019-05-19 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | submodule--helper: add a missing \n | Nguyễn Thái Ngọc Duy | 2019-05-08 | 1 | -1/+1 |
* | | | | | | Merge branch 'dl/warn-tagging-a-tag' | Junio C Hamano | 2019-05-19 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | tag: fix typo in nested tagging hint | Denton Liu | 2019-05-09 | 1 | -1/+1 |
* | | | | | | | Merge branch 'pw/clean-sequencer-state-upon-final-commit' | Junio C Hamano | 2019-05-13 | 1 | -2/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | commit/reset: try to clean up sequencer state | Phillip Wood | 2019-04-17 | 1 | -2/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'pw/rebase-i-internal' | Junio C Hamano | 2019-05-13 | 2 | -490/+465 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rebase -i: run without forking rebase--interactive | Phillip Wood | 2019-04-19 | 1 | -135/+86 |
| * | | | | | | | rebase: use a common action enum | Phillip Wood | 2019-04-19 | 1 | -43/+48 |
| * | | | | | | | rebase -i: use struct rebase_options in do_interactive_rebase() | Phillip Wood | 2019-04-19 | 1 | -33/+36 |
| * | | | | | | | rebase -i: use struct rebase_options to parse args | Phillip Wood | 2019-04-19 | 1 | -91/+112 |
| * | | | | | | | rebase -i: use struct object_id for squash_onto | Phillip Wood | 2019-04-19 | 1 | -8/+13 |
| * | | | | | | | rebase -i: use struct commit when parsing options | Phillip Wood | 2019-04-19 | 1 | -18/+24 |
| * | | | | | | | rebase -i: remove duplication | Phillip Wood | 2019-04-19 | 1 | -3/+2 |
| * | | | | | | | rebase -i: combine rebase--interactive.c with rebase.c | Phillip Wood | 2019-04-19 | 2 | -377/+367 |
| * | | | | | | | rebase: use OPT_RERERE_AUTOUPDATE() | Phillip Wood | 2019-04-19 | 1 | -17/+13 |
| * | | | | | | | rebase: rename write_basic_state() | Phillip Wood | 2019-04-19 | 1 | -2/+2 |
| * | | | | | | | rebase: don't translate trace strings | Phillip Wood | 2019-04-19 | 1 | -8/+7 |
| * | | | | | | | sequencer: always discard index after checkout | Phillip Wood | 2019-04-19 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internal | Junio C Hamano | 2019-04-19 | 1 | -21/+123 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'ew/repack-with-bitmaps-by-default' | Junio C Hamano | 2019-05-13 | 2 | -2/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | pack-objects: default to writing bitmap hash-cache | Jeff King | 2019-03-18 | 1 | -1/+1 |
| * | | | | | | | | | repack: enable bitmaps by default on bare repos | Eric Wong | 2019-03-18 | 1 | -1/+4 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'js/partial-clone-connectivity-check' | Junio C Hamano | 2019-05-13 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | clone: do faster object check for partial clones | Josh Steadmon | 2019-04-21 | 1 | -2/+4 |
* | | | | | | | | | | Merge branch 'js/misc-doc-fixes' | Junio C Hamano | 2019-05-08 | 1 | -30/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Turn `git serve` into a test helper | Johannes Schindelin | 2019-04-19 | 1 | -30/+0 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jt/clone-server-option' | Junio C Hamano | 2019-05-08 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | clone: send server options when using protocol v2 | Jonathan Tan | 2019-04-18 | 1 | -0/+6 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'tb/unexpected' | Junio C Hamano | 2019-05-08 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rev-list: let traversal die when --missing is not in use | Jeff King | 2019-04-10 | 1 | -1/+3 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'nd/sha1-name-c-wo-the-repository' | Junio C Hamano | 2019-05-08 | 2 | -5/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | refs.c: remove the_repo from read_ref_at() | Nguyễn Thái Ngọc Duy | 2019-04-08 | 1 | -2/+4 |
| * | | | | | | | | | | builtin rebase: use oideq() | SZEDER Gábor | 2019-04-08 | 1 | -1/+1 |
| * | | | | | | | | | | builtin rebase: use FREE_AND_NULL | SZEDER Gábor | 2019-04-08 | 1 | -2/+1 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'cc/replace-graft-peel-tags' | Junio C Hamano | 2019-05-08 | 1 | -7/+13 |
|\ \ \ \ \ \ \ \ \ \ |