summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-05-23 05:38:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-23 05:38:20 (GMT)
commit2c18e6ae2434a6caa5b3a7256608470948e73f66 (patch)
treef9bd49bc282a98ecf005a7de388d4268b846a8c9 /refs.c
parentad635e82d600e1b725a2e65d69114140db6bc876 (diff)
parent25cff9f109afbd6d21b199a38d15911b1f0c5069 (diff)
downloadgit-2c18e6ae2434a6caa5b3a7256608470948e73f66.zip
git-2c18e6ae2434a6caa5b3a7256608470948e73f66.tar.gz
git-2c18e6ae2434a6caa5b3a7256608470948e73f66.tar.bz2
Merge branch 'js/rebase-recreate-merge'
"git rebase" learned "--rebase-merges" to transplant the whole topology of commit graph elsewhere. * js/rebase-recreate-merge: rebase -i --rebase-merges: add a section to the man page rebase -i: introduce --rebase-merges=[no-]rebase-cousins pull: accept --rebase=merges to recreate the branch topology rebase --rebase-merges: avoid "empty merges" sequencer: handle post-rewrite for merge commands sequencer: make refs generated by the `label` command worktree-local rebase --rebase-merges: add test for --keep-empty rebase: introduce the --rebase-merges option rebase-helper --make-script: introduce a flag to rebase merges sequencer: fast-forward `merge` commands, if possible sequencer: introduce the `merge` command sequencer: introduce new commands to reset the revision git-rebase--interactive: clarify arguments sequencer: offer helpful advice when a command was rescheduled sequencer: refactor how original todo list lines are accessed sequencer: make rearrange_squash() a bit more obvious sequencer: avoid using errno clobbered by rollback_lock_file()
Diffstat (limited to 'refs.c')
-rw-r--r--refs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/refs.c b/refs.c
index 6fa3a49..1f31e6c 100644
--- a/refs.c
+++ b/refs.c
@@ -615,7 +615,8 @@ int dwim_log(const char *str, int len, struct object_id *oid, char **log)
static int is_per_worktree_ref(const char *refname)
{
return !strcmp(refname, "HEAD") ||
- starts_with(refname, "refs/bisect/");
+ starts_with(refname, "refs/bisect/") ||
+ starts_with(refname, "refs/rewritten/");
}
static int is_pseudoref_syntax(const char *refname)