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
2011-12-13
Merge branch 'maint-1.7.7' into maint
Junio C Hamano
1
-1
/
+1
2011-12-13
Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7
Junio C Hamano
1
-1
/
+1
2011-11-28
checkout,merge: loosen overwriting untracked file check based on info/exclude
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2011-11-17
do not let git_path clobber errno when reporting errors
Jonathan Nieder
1
-20
/
+29
2011-10-21
Merge branch 'nd/maint-autofix-tag-in-head' into maint
Junio C Hamano
1
-56
/
+61
2011-10-19
Merge branch 'js/merge-edit-option'
Junio C Hamano
1
-39
/
+70
2011-10-13
Merge branch 'nd/maint-autofix-tag-in-head'
Junio C Hamano
1
-56
/
+61
2011-10-12
Teach merge the '[-e|--edit]' option
Jay Soffian
1
-39
/
+70
2011-10-05
Merge branch 'jc/want-commit'
Junio C Hamano
1
-5
/
+14
2011-09-18
Accept tags in HEAD or MERGE_HEAD
Nguyễn Thái Ngọc Duy
1
-5
/
+2
2011-09-18
merge: remove global variable head[]
Nguyễn Thái Ngọc Duy
1
-44
/
+53
2011-09-18
merge: use return value of resolve_ref() to determine if HEAD is invalid
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2011-09-15
Allow git merge ":/<pattern>"
Junio C Hamano
1
-5
/
+14
2011-08-28
Merge branch 'jk/color-and-pager'
Junio C Hamano
1
-6
/
+0
2011-08-26
merge: keep stash[] a local variable
Nguyễn Thái Ngọc Duy
1
-17
/
+16
2011-08-25
Merge branch 'jc/merge-reword'
Junio C Hamano
1
-1
/
+1
2011-08-19
want_color: automatically fallback to color.ui
Jeff King
1
-4
/
+0
2011-08-18
diff: refactor COLOR_DIFF from a flag into an int
Jeff King
1
-2
/
+0
2011-05-31
Merge branch 'jk/format-patch-am'
Junio C Hamano
1
-1
/
+2
2011-05-26
clean up calling conventions for pretty.c functions
Jeff King
1
-1
/
+2
2011-05-25
merge: reword the final message
Junio C Hamano
1
-1
/
+1
2011-05-19
Merge branch 'jk/cherry-pick-root-with-resolve'
Junio C Hamano
1
-2
/
+10
2011-05-16
Merge branch 'mg/merge-ff-config'
Junio C Hamano
1
-0
/
+9
2011-05-16
cherry-pick: handle root commits with external strategies
Jeff King
1
-2
/
+10
2011-05-11
Merge branch 'jc/maint-branch-mergeoptions'
Junio C Hamano
1
-15
/
+26
2011-05-06
merge: introduce merge.ff configuration variable
Junio C Hamano
1
-0
/
+9
2011-05-06
Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config
Junio C Hamano
1
-15
/
+26
2011-05-02
Merge branch 'ab/i18n-fixup'
Junio C Hamano
1
-8
/
+8
2011-04-12
i18n: mark merge CHERRY_PICK_HEAD messages for translation
Ævar Arnfjörð Bjarmason
1
-3
/
+3
2011-04-12
i18n: mark merge "upstream" messages for translation
Ævar Arnfjörð Bjarmason
1
-4
/
+4
2011-04-12
i18n: mark merge "Could not read from" message for translation
Ævar Arnfjörð Bjarmason
1
-1
/
+1
2011-04-07
merge: allow "-" as a short-hand for "previous branch"
Junio C Hamano
1
-3
/
+6
2011-04-01
Merge branch 'jc/merge-sans-branch'
Junio C Hamano
1
-2
/
+40
2011-04-01
Merge branch 'ab/i18n-st'
Junio C Hamano
1
-64
/
+64
2011-03-25
merge: merge unborn index before setting ref
Jeff King
1
-1
/
+1
2011-03-24
merge: merge with the default upstream branch without argument
Junio C Hamano
1
-1
/
+38
2011-03-24
merge: match the help text with the documentation
Jared Hance
1
-2
/
+3
2011-03-19
Merge branch 'jk/merge-rename-ux'
Junio C Hamano
1
-0
/
+7
2011-03-09
i18n: git-merge "Wonderful" message
Ævar Arnfjörð Bjarmason
1
-1
/
+1
2011-03-09
i18n: git-merge "Updating %s..%s" message
Ævar Arnfjörð Bjarmason
1
-1
/
+1
2011-03-09
i18n: git-merge basic messages
Ævar Arnfjörð Bjarmason
1
-62
/
+62
2011-03-09
Merge branch 'js/cherry-pick-usability'
Junio C Hamano
1
-0
/
+7
2011-02-27
Merge branch 'mg/placeholders-are-lowercase'
Junio C Hamano
1
-1
/
+1
2011-02-27
Merge branch 'js/maint-merge-use-prepare-commit-msg-hook'
Junio C Hamano
1
-8
/
+29
2011-02-21
Introduce CHERRY_PICK_HEAD
Jay Soffian
1
-0
/
+7
2011-02-21
merge: enable progress reporting for rename detection
Jeff King
1
-0
/
+7
2011-02-15
merge: honor prepare-commit-msg hook
Jay Soffian
1
-8
/
+29
2011-02-15
Make <identifier> lowercase as per CodingGuidelines
Michael J Gruber
1
-1
/
+1
2011-02-15
Merge branch 'maint'
Junio C Hamano
1
-2
/
+2
2011-02-15
commit,merge,tag: describe -m likewise
Michael J Gruber
1
-2
/
+2
[next]