summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sg/index-pack-progress'Junio C Hamano2019-04-251-1/+9
|\
| * index-pack: show progress while checking objectsSZEDER Gábor2019-04-011-1/+9
* | Merge branch 'ab/commit-graph-fixes'Junio C Hamano2019-04-251-4/+19
|\ \
| * | commit-graph verify: detect inability to read the graphÆvar Arnfjörð Bjarmason2019-04-011-1/+3
| * | commit-graph: don't pass filename to load_commit_graph_one_fd_st()Ævar Arnfjörð Bjarmason2019-04-011-2/+2
| * | commit-graph: don't early exit(1) on e.g. "git status"Ævar Arnfjörð Bjarmason2019-04-011-4/+17
* | | Merge branch 'ab/gc-reflog'Junio C Hamano2019-04-251-8/+29
|\ \ \
| * | | gc: handle & check gc.reflogExpire configÆvar Arnfjörð Bjarmason2019-04-011-0/+17
| * | | gc: refactor a "call me once" patternÆvar Arnfjörð Bjarmason2019-03-181-3/+9
| * | | gc: convert to using the_hash_algoÆvar Arnfjörð Bjarmason2019-03-181-2/+3
| * | | gc: remove redundant check for gc_auto_thresholdÆvar Arnfjörð Bjarmason2019-03-141-3/+0
* | | | Merge branch 'nd/checkout-m'Junio C Hamano2019-04-252-2/+10
|\ \ \ \
| * | | | checkout: prevent losing staged changes with --mergeNguyễn Thái Ngọc Duy2019-03-241-1/+10
| * | | | read-tree: add --quietNguyễn Thái Ngọc Duy2019-03-241-0/+1
| * | | | unpack-trees: rename "gently" flag to "quiet"Nguyễn Thái Ngọc Duy2019-03-241-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'js/difftool-no-index'Junio C Hamano2019-04-251-4/+10
|\ \ \ \
| * | | | difftool: allow running outside Git worktrees with --no-indexJohannes Schindelin2019-03-181-3/+10
| * | | | difftool: remove obsolete (and misleading) commentJohannes Schindelin2019-03-181-1/+0
| | |/ / | |/| |
* | | | Merge branch 'nd/commit-a-with-paths-msg-update'Junio C Hamano2019-04-251-1/+2
|\ \ \ \
| * | | | commit: improve error message in "-a <paths>" caseNguyễn Thái Ngọc Duy2019-03-221-1/+2
| | |_|/ | |/| |
* | | | Merge branch 'nd/diff-parseopt-4'Junio C Hamano2019-04-253-41/+11
|\ \ \ \
| * | | | am: avoid diff_opt_parse()Nguyễn Thái Ngọc Duy2019-03-241-2/+2
| * | | | diff --no-index: use parse_options() instead of diff_opt_parse()Nguyễn Thái Ngọc Duy2019-03-241-18/+3
| * | | | range-diff: use parse_options() instead of diff_opt_parse()Nguyễn Thái Ngọc Duy2019-03-241-20/+6
* | | | | Merge branch 'jk/unused-params-even-more'Junio C Hamano2019-04-2512-28/+23
|\ \ \ \ \
| * | | | | parse_opt_ref_sorting: always use with NONEG flagJeff King2019-03-214-8/+4
| * | | | | fetch_pack(): drop unused parametersJeff King2019-03-201-1/+1
| * | | | | report_path_error(): drop unused prefix parameterJeff King2019-03-204-6/+6
| * | | | | update-index: drop unused prefix_length parameter from do_reupdate()Jeff King2019-03-201-3/+2
| * | | | | log: drop unused "len" from show_tagger()Jeff King2019-03-201-4/+4
| * | | | | log: drop unused rev_info from early outputJeff King2019-03-201-5/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ag/sequencer-reduce-rewriting-todo'Junio C Hamano2019-04-251-21/+123
|\ \ \ \ \
| * | | | | rebase--interactive: move transform_todo_file()Alban Gruin2019-03-071-1/+25
| * | | | | rebase-interactive: rewrite edit_todo_list() to handle the initial editAlban Gruin2019-03-071-1/+23
| * | | | | rebase--interactive: move rearrange_squash_in_todo_file()Alban Gruin2019-03-071-1/+27
| * | | | | rebase--interactive: move sequencer_add_exec_commands()Alban Gruin2019-03-071-1/+26
| * | | | | sequencer: change complete_action() to use the refactored functionsAlban Gruin2019-03-071-14/+6
| * | | | | sequencer: make sequencer_make_script() write its script to a strbufAlban Gruin2019-03-071-5/+8
| * | | | | sequencer: refactor rearrange_squash() to work on a todo_listAlban Gruin2019-03-071-1/+1
| * | | | | sequencer: refactor sequencer_add_exec_commands() to work on a todo_listAlban Gruin2019-03-071-4/+14
| * | | | | sequencer: refactor check_todo_list() to work on a todo_listAlban Gruin2019-01-291-1/+1
| * | | | | sequencer: refactor transform_todos() to work on a todo_listAlban Gruin2019-01-291-1/+1
* | | | | | Merge branch 'bp/post-index-change-hook'Junio C Hamano2019-04-252-0/+3
|\ \ \ \ \ \
| * | | | | | read-cache: add post-index-change hookBen Peart2019-02-152-0/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'tg/stash-in-c-show-default-to-p-fix'Junio C Hamano2019-04-221-0/+4
|\ \ \ \ \ \
| * | | | | | stash: setup default diff output format if necessaryThomas Gummerer2019-03-211-0/+4
* | | | | | | Merge branch 'js/stash-in-c-pathspec-fix'Junio C Hamano2019-04-221-31/+40
|\ \ \ \ \ \ \
| * | | | | | | stash: pass pathspec as pointerThomas Gummerer2019-03-121-30/+38
| * | | | | | | built-in stash: handle :(glob) pathspecs againJohannes Schindelin2019-03-081-2/+3
| |/ / / / / /
* | | | | | | Merge branch 'tb/stash-in-c-unused-param-fix'Junio C Hamano2019-04-221-4/+4
|\ \ \ \ \ \ \