| commit | 08e6b602bac273b218fbd441cea1915b5bb89a67 | |
| author | Paolo Bonzini <bonzini@gnu.org> | |
| Sun, 12 Jul 2009 12:17:32 +0000 (12 14:17 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 12 Jul 2009 20:48:34 +0000 (12 13:48 -0700) | ||
| tree | bb92486143549cc1d9133866fa2d80e2ff197ea8 | treesnapshot (tar.gz zip) |
| parent | 50f2e5077d6c1a4ad99d4f2df5393b6b576303e4 | commitdiff |
move deletion of merge configuration to branch.c
In the next step, deletion of merge configuration will become more
complex, so we move it into a separate function. Since the
configuration is installed with a function in branch.c, I'm placing
deletion there as well.
At the same time, the interface is changed to get the full ref name
including refs/heads/. This makes no big difference for the caller.
Signed-off-by: Paolo Bonzini <bonzini@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
In the next step, deletion of merge configuration will become more
complex, so we move it into a separate function. Since the
configuration is installed with a function in branch.c, I'm placing
deletion there as well.
At the same time, the interface is changed to get the full ref name
including refs/heads/. This makes no big difference for the caller.
Signed-off-by: Paolo Bonzini <bonzini@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| branch.c | diffblobblamehistory | |
| branch.h | diffblobblamehistory | |
| builtin-branch.c | diffblobblamehistory |