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
2019-07-29
Merge branch 'ds/close-object-store' into maint
Junio C Hamano
1
-1
/
+1
2019-07-25
Merge branch 'vv/merge-squash-with-explicit-commit' into maint
Junio C Hamano
1
-1
/
+11
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-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
2018-09-21
diff.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2018-09-17
Merge branch 'jk/cocci'
Junio C Hamano
1
-3
/
+3
2018-09-17
Merge branch 'ds/reachable'
Junio C Hamano
1
-0
/
+1
2018-08-29
convert "oidcmp() != 0" to "!oideq()"
Jeff King
1
-1
/
+1
2018-08-29
convert "oidcmp() == 0" to oideq()
Jeff King
1
-2
/
+2
2018-08-15
Merge branch 'nd/i18n'
Junio C Hamano
1
-1
/
+1
2018-08-02
Merge branch 'js/rebase-merge-octopus'
Junio C Hamano
1
-0
/
+32
2018-08-02
Merge branch 'bc/object-id'
Junio C Hamano
1
-5
/
+6
2018-07-23
Update messages in preparation for i18n
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2018-07-20
commit.h: remove method declarations
Derrick Stolee
1
-0
/
+1
2018-07-18
Merge branch 'sb/object-store-grafts'
Junio C Hamano
1
-18
/
+19
2018-07-16
builtin/merge: switch to use the_hash_algo
brian m. carlson
1
-5
/
+6
2018-07-11
merge: allow reading the merge commit message from a file
Johannes Schindelin
1
-0
/
+32
2018-06-29
Merge branch 'sb/object-store-grafts' into sb/object-store-lookup
Junio C Hamano
1
-18
/
+19
2018-06-25
Merge branch 'ds/commit-graph-lockfile-fix'
Junio C Hamano
1
-3
/
+4
2018-06-25
Merge branch 'nd/commit-util-to-slab'
Junio C Hamano
1
-12
/
+13
2018-06-01
Merge branch 'nd/use-opt-int-set-f'
Junio C Hamano
1
-3
/
+3
2018-06-01
Merge branch 'nd/command-list'
Junio C Hamano
1
-0
/
+1
2018-05-30
Merge branch 'bw/ref-prefix-for-configured-refspec'
Junio C Hamano
1
-0
/
+1
2018-05-30
Merge branch 'bc/object-id'
Junio C Hamano
1
-7
/
+7
2018-05-30
Merge branch 'ma/lockfile-cleanup'
Junio C Hamano
1
-2
/
+2
2018-05-24
Use OPT_SET_INT_F() for cmdline option specification
Nguyễn Thái Ngọc Duy
1
-3
/
+3
2018-05-22
merge: check config before loading commits
Derrick Stolee
1
-3
/
+4
2018-05-21
merge: use commit-slab in merge remote desc instead of commit->util
Nguyễn Thái Ngọc Duy
1
-12
/
+13
[next]