Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
merge-recursive: get rid of the index_only global variable
author
Miklos Vajna
<vmiklos@frugalware.org>
Tue, 2 Sep 2008 21:53:47 +0000
(23:53 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 5 Sep 2008 05:49:34 +0000
(22:49 -0700)
struct merge_options already has a call_depth member, and index_only
global variable always equals to !!call_depth.
We always use index_only as a condition, so we can just
use call_depth instead of index_only.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
raw
|
patch
| inline |
side by side
(from:
b7fa51d
)
No differences found