diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-21 12:51:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-22 23:36:47 -0700 |
| commit | 431b1969fcde69959a23355fba6894fb69c8fa0c (patch) | |
| tree | f8abd4ca9650a62e3b46a0e35ce083654e71bcec /builtin-merge.c | |
| parent | 91408042768c05347c1b9f081a00387ca07b26fe (diff) | |
| download | git-431b1969fcde69959a23355fba6894fb69c8fa0c.tar.gz git-431b1969fcde69959a23355fba6894fb69c8fa0c.tar.xz | |
Rename interpret/substitute nth_last_branch functions
These allow you to say "git checkout @{-2}" to switch to the branch two
"branch switching" ago by pretending as if you typed the name of that
branch. As it is likely that we will be introducing more short-hands to
write the name of a branch without writing it explicitly, rename the
functions from "nth_last_branch" to more generic "branch_name", to prepare
for different semantics.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge.c')
| -rw-r--r-- | builtin-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index 4c119359e..e94ea7c35 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -361,7 +361,7 @@ static void merge_name(const char *remote, struct strbuf *msg) int len, early; len = strlen(remote); - if (interpret_nth_last_branch(remote, &bname) == len) + if (interpret_branch_name(remote, &bname) == len) remote = bname.buf; memset(branch_head, 0, sizeof(branch_head)); |