| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'maint' | Junio C Hamano | 2007-11-28 |
| | | | | | | | * maint: scripts: do not get confused with HEAD in work tree Improve description of git-branch -d and -D in man page. | ||
| * | 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 |