Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2006-12-17 | Fix mis-mark-up in git-merge-file.txt documentation | Junio C Hamano | 1 | -2/+2 | |
Signed-off-by: Junio C Hamano <junkio@cox.net> | |||||
2006-12-16 | Document git-merge-file | Johannes Schindelin | 1 | -0/+92 | |
Most of this is derived from the documentation of RCS merge. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> |