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-one-file.sh
Age
Commit message (
Expand
)
Author
Files
Lines
2007-06-07
War on whitespace
Junio C Hamano
1
-1
/
+1
2006-12-21
Use git-merge-file in git-merge-one-file, too
Johannes Schindelin
1
-1
/
+1
2006-10-27
merge: loosen overcautious "working file will be lost" check.
Junio C Hamano
1
-1
/
+15
2006-07-10
Fix more typos, primarily in the code
Pavel Roskin
1
-1
/
+1
2006-04-13
Shell utilities: Guard against expr' magic tokens.
Mark Wooding
1
-1
/
+1
2006-01-05
trivial: remove the dots at the end of file names from merge-one-file
Alex Riesen
1
-2
/
+2
2005-12-07
git-merge-one: new merge world order.
Junio C Hamano
1
-16
/
+9
2005-12-06
git-merge-one-file: resurrect leading path creation.
Junio C Hamano
1
-2
/
+10
2005-12-02
merge-one-file: make sure we do not mismerge symbolic links.
Junio C Hamano
1
-0
/
+8
2005-12-02
merge-one-file: make sure we create the merged file.
Junio C Hamano
1
-1
/
+7
2005-12-01
git-merge-one-file: do not worry about 'rmdir -p' not removing directory.
Junio C Hamano
1
-1
/
+1
2005-11-30
merge-one-file: leave unmerged index entries upon automerge failure.
Linus Torvalds
1
-5
/
+1
2005-11-20
merge-one-file: use rmdir -p
Junio C Hamano
1
-5
/
+1
2005-11-19
merge-one-file: remove empty directories
Junio C Hamano
1
-1
/
+6
2005-11-11
merge-one-file: use empty- or common-base condintionally in two-stage merge.
Junio C Hamano
1
-0
/
+6
2005-11-11
merge-one-file: use common as base, instead of emptiness.
Junio C Hamano
1
-2
/
+4
2005-11-11
merge with /dev/null as base, instead of punting O==empty case
Junio C Hamano
1
-4
/
+16
2005-09-07
Big tool rename.
Junio C Hamano
1
-0
/
+88