Commit Graph

447 Commits (bcd020f88e1e22f38422ac3f73ab06b34ec4bef1)

Author SHA1 Message Date
Phillip Wood b7de153bd9 create_autostash(): remove unneeded parameter 10 months ago
Elijah Newren 6046f7a91c merge: fix memory leaks in cmd_merge() 10 months ago
Emily Shaffer 67ad630617 merge: convert post-merge to use hook.h 11 months ago
Jean-Noël Avila 12909b6b8a i18n: turn "options are incompatible" into "cannot be used together" 11 months ago
Junio C Hamano bd2bc94252 merge: allow to pretend a merge is made into a different branch 11 months ago
Ævar Arnfjörð Bjarmason 2b7098936c run-command API users: use strvec_pushl(), not argv construction 1 year ago
Ævar Arnfjörð Bjarmason 465028e0e2 merge: add missing strbuf_release() 1 year ago
Elijah Newren 1b5f37334a Remove ignored files by default when they are in the way 1 year ago
Elijah Newren 04988c8d18 unpack-trees: introduce preserve_ignored to unpack_trees_options 1 year ago
Ævar Arnfjörð Bjarmason 07a348e746 hook.c users: use "hook_exists()" instead of "find_hook()" 1 year ago
Ævar Arnfjörð Bjarmason 5e3aba33da hook.[ch]: move find_hook() from run-command.c to hook.c 1 year ago
Derrick Stolee a33806398a merge: make sparse-aware with ORT 1 year ago
Johannes Schindelin 5a22a334cb run_auto_maintenance(): implicitly close the object store 1 year ago
René Scharfe 66e905b7dd use xopen() to handle fatal open(2) failures 1 year ago
Ben Boeckel ed9bff0817 advice: remove read uses of most global `advice_` variables 1 year ago
Carlo Marcelo Arenas Belón 00e302da76 builtin/merge: avoid -Wformat-extra-args from ancient Xcode 1 year ago
Elijah Newren 6a5fb96672 Change default merge backend from recursive to ort 1 year ago
Elijah Newren 81483fe613 Update error message and code comment 1 year ago
Andrzej Hunt 8c05e42c7a builtin/merge: free found_ref when done 1 year ago
Philippe Blain e082631e51 merge: apply autostash if merge strategy fails 1 year ago
Philippe Blain 12510bd5da merge: apply autostash if fast-forward fails 1 year ago
Philippe Blain 9938f30d13 merge: add missing word "strategy" to a message 1 year ago
Alex Henrie 3d5fc24dae pull: abort if --ff-only is given and fast-forwarding is impossible 1 year ago
Alex Henrie a30e43f61a merge: don't translate literal commands 2 years ago
Josh Soref ad9322da03 merge: fix swapped "up to date" message components 2 years ago
Eric Sunshine 80cde95eec merge(s): apply consistent punctuation to "up to date" messages 2 years ago
René Scharfe ca56dadb4b use CALLOC_ARRAY 2 years ago
Sergey Organov 09322b1da9 diff-merges: new function diff_merges_suppress() 2 years ago
Elijah Newren 14c4586c2d merge,rebase,revert: select ort or recursive by config or environment 2 years ago
Bradley M. Kuhn 3abd4a67d9 Documentation: stylistically normalize references to Signed-off-by: 2 years ago
Derrick Stolee a95ce12430 maintenance: replace run_auto_gc() 2 years ago
Jonathan Tan f24c30e0b6 wt-status: tolerate dangling marks 2 years ago
Han-Wen Nienhuys c8e4159efd sequencer: treat CHERRY_PICK_HEAD as a pseudo ref 2 years ago
Elijah Newren 8d552258f4 merge: make merge.renormalize work for all uses of merge machinery 2 years ago
Andrew Ng 8777616e4d merge: optimization to skip evaluate_result for single strategy 3 years ago
Junio C Hamano 7c3e9e8cfb auto-gc: pass --quiet down from am, commit, merge and rebase 3 years ago
Denton Liu 203c85339f Use OPT_CALLBACK and OPT_CALLBACK_F 3 years ago
Derrick Stolee b23ea9790d tests: write commit-graph with Bloom filters 3 years ago
Martin Ågren 9881b451f3 merge: use skip_prefix to parse config key 3 years ago
Denton Liu a03b55530a merge: teach --autostash option 3 years ago
Hans Jerry Illikainen 54887b4689 gpg-interface: add minTrustLevel as a configuration option 3 years ago
Thomas Gummerer e080b34540 merge: use refresh_and_write_cache 3 years ago
Michael J Gruber bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook 3 years ago
Michael J Gruber 6098817fd7 git-merge: honor pre-merge-commit hook 3 years ago
Michael J Gruber a1f3dd7eb3 merge: do no-verify like commit 3 years ago
Edmundo Carmona Antoranz f00abe6ae0 builtin/merge.c - cleanup of code in for-cycle that tests strategies 3 years ago
Derrick Stolee 2d511cfc0b packfile: rename close_all_packs to close_object_store 4 years ago
Vishal Verma 1d14d0c994 merge: refuse --commit with --squash 4 years ago
Nguyễn Thái Ngọc Duy f3f8311ec7 merge: add --quit 4 years ago
Nguyễn Thái Ngọc Duy b64335554a merge: remove drop_save() in favor of remove_merge_branch_state() 4 years ago