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
/
git-merge.sh
Age
Commit message (
Expand
)
Author
Files
Lines
2005-10-22
Allow git-merge not to commit.
Junio C Hamano
1
-11
/
+17
2005-10-03
[PATCH] Enable and fix support for base less merges.
Fredrik Kuivinen
1
-2
/
+2
2005-10-02
Handle really trivial case inside git-merge.
Junio C Hamano
1
-1
/
+21
2005-09-28
Use git-update-ref in scripts.
Junio C Hamano
1
-4
/
+5
2005-09-28
Fastpath the normal case by not checking that index matches HEAD.
Junio C Hamano
1
-7
/
+4
2005-09-26
Give default merge message after failed automerge.
Junio C Hamano
1
-4
/
+10
2005-09-26
Fix overzealous cleanliness check in git-merge
Junio C Hamano
1
-18
/
+50
2005-09-25
[PATCH] More descriptive messages for conflict cases in merges
Fredrik Kuivinen
1
-3
/
+4
2005-09-13
[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
Fredrik Kuivinen
1
-2
/
+2
2005-09-12
Fix off-by-one error in git-merge
Junio C Hamano
1
-1
/
+1
2005-09-10
Add a new merge strategy by Fredrik Kuivinen.
Junio C Hamano
1
-1
/
+1
2005-09-10
Use Daniel's read-tree in the merge strategy 'resolve'.
Junio C Hamano
1
-3
/
+3
2005-09-10
Multi-backend merge driver.
Junio C Hamano
1
-0
/
+212