index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
builtin
/
merge.c
Age
Commit message (
Expand
)
Author
Files
Lines
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
2019-03-07
Merge branch 'nd/diff-parseopt'
Junio C Hamano
1
-3
/
+6
2019-01-27
parse-options: allow ll_callback with OPTION_CALLBACK
Nguyễn Thái Ngọc Duy
1
-0
/
+2
2019-01-27
parse-options: avoid magic return codes
Nguyễn Thái Ngọc Duy
1
-2
/
+3
2019-01-27
parse-options: stop abusing 'callback' for lowlevel callbacks
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2019-01-24
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
Nguyễn Thái Ngọc Duy
1
-0
/
+1
2019-01-14
merge-recursive.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2019-01-04
Merge branch 'nd/the-index'
Junio C Hamano
1
-1
/
+1
2019-01-04
Merge branch 'nd/i18n'
Junio C Hamano
1
-2
/
+2
2018-11-18
Merge branch 'jk/verify-sig-merge-into-void'
Junio C Hamano
1
-25
/
+5
2018-11-12
sequencer.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2018-11-12
parse-options: replace opterror() with optname()
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2018-11-12
alias.c: mark split_cmdline_strerror() strings for translation
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2018-11-07
merge: handle --verify-signatures for unborn branch
Jeff King
1
-0
/
+4
2018-11-07
merge: extract verify_merge_signature() helper
Jeff King
1
-25
/
+1
2018-11-06
assert NOARG/NONEG behavior of parse-options callbacks
Jeff King
1
-0
/
+1
2018-10-19
Merge branch 'nd/the-index'
Junio C Hamano
1
-7
/
+9
2018-09-21
revision.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
1
-2
/
+2
2018-09-21
rerere.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2018-09-21
merge.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
1
-3
/
+5
[next]