tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2021-08-04	Merge branch 'pb/merge-autostash-more'	Junio C Hamano	1	-1/+3
2021-07-26	builtin/merge: free found_ref when done	Andrzej Hunt	1	-1/+2
2021-07-23	merge: apply autostash if merge strategy fails	Philippe Blain	1	-0/+1
2021-07-23	merge: apply autostash if fast-forward fails	Philippe Blain	1	-0/+1
2021-07-23	merge: add missing word "strategy" to a message	Philippe Blain	1	-1/+1
2021-06-10	Merge branch 'ah/merge-usage-i18n-fix'	Junio C Hamano	1	-2/+2
2021-05-16	merge: don't translate literal commands	Alex Henrie	1	-2/+2
2021-05-03	merge: fix swapped "up to date" message components	Josh Soref	1	-5/+9
2021-05-03	merge(s): apply consistent punctuation to "up to date" messages	Eric Sunshine	1	-1/+1
2021-03-13	use CALLOC_ARRAY	René Scharfe	1	-1/+1
2021-02-05	Merge branch 'so/log-diff-merge'	Junio C Hamano	1	-1/+2
2020-12-21	diff-merges: new function diff_merges_suppress()	Sergey Organov	1	-1/+2
2020-11-18	Merge branch 'en/merge-ort-api-null-impl'	Junio C Hamano	1	-3/+23
2020-11-02	merge,rebase,revert: select ort or recursive by config or environment	Elijah Newren	1	-3/+23
2020-10-20	Documentation: stylistically normalize references to Signed-off-by:	Bradley M. Kuhn	1	-1/+1
2020-09-25	Merge branch 'ds/maintenance-part-1'	Junio C Hamano	1	-1/+1
2020-09-17	maintenance: replace run_auto_gc()	Derrick Stolee	1	-1/+1
2020-09-09	Merge branch 'jt/interpret-branch-name-fallback'	Junio C Hamano	1	-1/+1
2020-09-02	wt-status: tolerate dangling marks	Jonathan Tan	1	-1/+1
2020-08-21	sequencer: treat CHERRY_PICK_HEAD as a pseudo ref	Han-Wen Nienhuys	1	-1/+1
2020-08-03	merge: make merge.renormalize work for all uses of merge machinery	Elijah Newren	1	-4/+0
2020-06-02	Merge branch 'an/merge-single-strategy-optim'	Junio C Hamano	1	-1/+1
2020-05-19	merge: optimization to skip evaluate_result for single strategy	Andrew Ng	1	-1/+1
2020-05-13	Merge branch 'jc/auto-gc-quiet'	Junio C Hamano	1	-2/+1
2020-05-07	auto-gc: pass --quiet down from am, commit, merge and rebase	Junio C Hamano	1	-2/+1
2020-05-05	Merge branch 'dl/opt-callback-cleanup'	Junio C Hamano	1	-2/+2
2020-05-01	Merge branch 'ds/blame-on-bloom'	Junio C Hamano	1	-2/+5
2020-04-29	Merge branch 'dl/merge-autostash'	Junio C Hamano	1	-0/+25
2020-04-28	Use OPT_CALLBACK and OPT_CALLBACK_F	Denton Liu	1	-2/+2
2020-04-16	tests: write commit-graph with Bloom filters	Derrick Stolee	1	-2/+5
2020-04-11	merge: use skip_prefix to parse config key	Martin Ågren	1	-3/+5
2020-04-10	merge: teach --autostash option	Denton Liu	1	-0/+25
2020-01-15	gpg-interface: add minTrustLevel as a configuration option	Hans Jerry Illikainen	1	-2/+7
2019-10-07	Merge branch 'tg/stash-refresh-index'	Junio C Hamano	1	-10/+3
2019-09-20	merge: use refresh_and_write_cache	Thomas Gummerer	1	-10/+3
2019-08-07	merge: --no-verify to bypass pre-merge-commit hook	Michael J Gruber	1	-2/+2
2019-08-07	git-merge: honor pre-merge-commit hook	Michael J Gruber	1	-0/+12
2019-08-07	merge: do no-verify like commit	Michael J Gruber	1	-3/+3
2019-07-19	Merge branch 'ea/merge-code-cleanup'	Junio C Hamano	1	-33/+20
2019-07-09	Merge branch 'ds/close-object-store'	Junio C Hamano	1	-1/+1
2019-07-09	builtin/merge.c - cleanup of code in for-cycle that tests strategies	Edmundo Carmona Antoranz	1	-33/+20
2019-06-17	Merge branch 'vv/merge-squash-with-explicit-commit'	Junio C Hamano	1	-1/+11
2019-06-13	Merge branch 'nd/merge-quit'	Junio C Hamano	1	-12/+18
2019-06-12	packfile: rename close_all_packs to close_object_store	Derrick Stolee	1	-1/+1
2019-05-28	merge: refuse --commit with --squash	Vishal Verma	1	-1/+11
2019-05-19	merge: add --quit	Nguyễn Thái Ngọc Duy	1	-0/+13
2019-05-13	merge: remove drop_save() in favor of remove_merge_branch_state()	Nguyễn Thái Ngọc Duy	1	-12/+5
2019-04-19	cherry-pick/revert: add scissors line on merge conflict	Denton Liu	1	-8/+2
2019-04-18	merge: add scissors line on merge conflict	Denton Liu	1	-0/+14
2019-04-18	merge: cleanup messages like commit	Denton Liu	1	-10/+31