development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 21:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
45124 commits 6 branches 951 tags 512 MiB
Commit graph

2 commits

Author SHA1 Message Date
Junio C Hamano d25430c5f8 Merge branch 'maint' 
* maint:
  scripts: do not get confused with HEAD in work tree
  Improve description of git-branch -d and -D in man page.
 2007-11-28 17:06:57 -08:00
Thomas Harning a00a42ae33 git-merge-ours: make it a builtin. 
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>
 2007-11-22 14:21:59 -08:00
Renamed from git-merge-ours.sh (Browse further)