index
:
git
master
git
Fast-forward packages
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
git-merge-one-file.sh
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Fix more typos, primarily in the code
Pavel Roskin
2006-07-10
1
-1
/
+1
*
Shell utilities: Guard against expr' magic tokens.
Mark Wooding
2006-04-14
1
-1
/
+1
*
trivial: remove the dots at the end of file names from merge-one-file
Alex Riesen
2006-01-06
1
-2
/
+2
*
git-merge-one: new merge world order.
Junio C Hamano
2005-12-07
1
-16
/
+9
*
git-merge-one-file: resurrect leading path creation.
Junio C Hamano
2005-12-06
1
-2
/
+10
*
merge-one-file: make sure we do not mismerge symbolic links.
Junio C Hamano
2005-12-02
1
-0
/
+8
*
merge-one-file: make sure we create the merged file.
Junio C Hamano
2005-12-02
1
-1
/
+7
*
git-merge-one-file: do not worry about 'rmdir -p' not removing directory.
Junio C Hamano
2005-12-02
1
-1
/
+1
*
merge-one-file: leave unmerged index entries upon automerge failure.
Linus Torvalds
2005-11-30
1
-5
/
+1
*
merge-one-file: use rmdir -p
Junio C Hamano
2005-11-20
1
-5
/
+1
*
merge-one-file: remove empty directories
Junio C Hamano
2005-11-20
1
-1
/
+6
*
merge-one-file: use empty- or common-base condintionally in two-stage merge.
Junio C Hamano
2005-11-12
1
-0
/
+6
*
merge-one-file: use common as base, instead of emptiness.
Junio C Hamano
2005-11-12
1
-2
/
+4
*
merge with /dev/null as base, instead of punting O==empty case
Junio C Hamano
2005-11-12
1
-4
/
+16
*
Big tool rename.
Junio C Hamano
2005-09-08
1
-0
/
+88