kernel/git - git - PowerEL Git System

Commit Graph

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

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

2 Commits (22fa97d4e011de82b44fdc83c27e919a996ce1be)