summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* verify-tag: drop signal.h includeJeff King2019-06-192-2/+0
* Merge branch 'js/rebase-config-bitfix'Junio C Hamano2019-05-301-1/+1
|\
| * rebase: replace incorrect logical negation by correct bitwise oneJohannes Schindelin2019-05-281-1/+1
* | Merge branch 'js/difftool-no-index'Junio C Hamano2019-05-191-1/+2
|\ \
| * | difftool --no-index: error out on --dir-diff (and don't crash)Johannes Schindelin2019-05-091-1/+2
* | | Merge branch 'ds/midx-too-many-packs'Junio C Hamano2019-05-192-2/+2
|\ \ \
| * | | midx: pass a repository pointerDerrick Stolee2019-05-072-2/+2
* | | | Merge branch 'en/unicode-in-refnames'Junio C Hamano2019-05-192-0/+5
|\ \ \ \
| * | | | Honor core.precomposeUnicode in more placesElijah Newren2019-04-262-0/+5
| | |_|/ | |/| |
* | | | Merge branch 'dl/difftool-mergetool'Junio C Hamano2019-05-191-8/+5
|\ \ \ \
| * | | | difftool: fallback on merge.guitoolDenton Liu2019-05-131-8/+2
| * | | | difftool: make --gui, --tool and --extcmd mutually exclusiveDenton Liu2019-05-131-0/+3
* | | | | Merge branch 'nd/parse-options-aliases'Junio C Hamano2019-05-191-4/+1
|\ \ \ \ \
| * | | | | parse-options: don't emit "ambiguous option" for aliasesNguyễn Thái Ngọc Duy2019-05-071-4/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'nd/submodule-helper-incomplete-line-fix'Junio C Hamano2019-05-191-1/+1
|\ \ \ \ \
| * | | | | submodule--helper: add a missing \nNguyễn Thái Ngọc Duy2019-05-081-1/+1
* | | | | | Merge branch 'dl/warn-tagging-a-tag'Junio C Hamano2019-05-191-1/+1
|\ \ \ \ \ \
| * | | | | | tag: fix typo in nested tagging hintDenton Liu2019-05-091-1/+1
* | | | | | | Merge branch 'pw/clean-sequencer-state-upon-final-commit'Junio C Hamano2019-05-131-2/+1
|\ \ \ \ \ \ \
| * | | | | | | commit/reset: try to clean up sequencer statePhillip Wood2019-04-171-2/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'pw/rebase-i-internal'Junio C Hamano2019-05-132-490/+465
|\ \ \ \ \ \ \
| * | | | | | | rebase -i: run without forking rebase--interactivePhillip Wood2019-04-191-135/+86
| * | | | | | | rebase: use a common action enumPhillip Wood2019-04-191-43/+48
| * | | | | | | rebase -i: use struct rebase_options in do_interactive_rebase()Phillip Wood2019-04-191-33/+36
| * | | | | | | rebase -i: use struct rebase_options to parse argsPhillip Wood2019-04-191-91/+112
| * | | | | | | rebase -i: use struct object_id for squash_ontoPhillip Wood2019-04-191-8/+13
| * | | | | | | rebase -i: use struct commit when parsing optionsPhillip Wood2019-04-191-18/+24
| * | | | | | | rebase -i: remove duplicationPhillip Wood2019-04-191-3/+2
| * | | | | | | rebase -i: combine rebase--interactive.c with rebase.cPhillip Wood2019-04-192-377/+367
| * | | | | | | rebase: use OPT_RERERE_AUTOUPDATE()Phillip Wood2019-04-191-17/+13
| * | | | | | | rebase: rename write_basic_state()Phillip Wood2019-04-191-2/+2
| * | | | | | | rebase: don't translate trace stringsPhillip Wood2019-04-191-8/+7
| * | | | | | | sequencer: always discard index after checkoutPhillip Wood2019-04-191-1/+1
| * | | | | | | Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internalJunio C Hamano2019-04-191-21/+123
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'ew/repack-with-bitmaps-by-default'Junio C Hamano2019-05-132-2/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pack-objects: default to writing bitmap hash-cacheJeff King2019-03-181-1/+1
| * | | | | | | | | repack: enable bitmaps by default on bare reposEric Wong2019-03-181-1/+4
| |/ / / / / / / /
* | | | | | | | | Merge branch 'js/partial-clone-connectivity-check'Junio C Hamano2019-05-131-2/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | clone: do faster object check for partial clonesJosh Steadmon2019-04-211-2/+4
* | | | | | | | | | Merge branch 'js/misc-doc-fixes'Junio C Hamano2019-05-081-30/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Turn `git serve` into a test helperJohannes Schindelin2019-04-191-30/+0
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jt/clone-server-option'Junio C Hamano2019-05-081-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | clone: send server options when using protocol v2Jonathan Tan2019-04-181-0/+6
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'tb/unexpected'Junio C Hamano2019-05-081-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rev-list: let traversal die when --missing is not in useJeff King2019-04-101-1/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'nd/sha1-name-c-wo-the-repository'Junio C Hamano2019-05-082-5/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | refs.c: remove the_repo from read_ref_at()Nguyễn Thái Ngọc Duy2019-04-081-2/+4
| * | | | | | | | | | builtin rebase: use oideq()SZEDER Gábor2019-04-081-1/+1
| * | | | | | | | | | builtin rebase: use FREE_AND_NULLSZEDER Gábor2019-04-081-2/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'cc/replace-graft-peel-tags'Junio C Hamano2019-05-081-7/+13
|\ \ \ \ \ \ \ \ \ \