| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Show usage string for 'git merge-ours -h' | Jonathan Nieder | 2009-11-09 |
| | | | | | | | | | | | | | | | | This change is strictly about 'git merge-ours -h' without any other options and arguments. This change cannot break compatibility since merge drivers are always passed '--', among other arguments. Any usage string for this command is a lie, since it ignored its arguments until now. Still, it makes sense to let the user know the expected usage when asked. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | ||
| * | git-merge-ours: make it a builtin. | Thomas Harning | 2007-11-22 |
| Except that this fixes a longstanding corner case bug by tightening the way underlying diff-index command is run, it is functionally equivalent to the scripted version. Signed-off-by: Thomas Harning Jr <harningt@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | |||
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |
path: root/builtin-merge-ours.c