summaryrefslogtreecommitdiff
path: root/remote.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-10 12:33:18 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-10 12:33:18 -0700
commite6747627865347a534e7106bb1d14e32867b234d (patch)
treee1d42d0b487628340329a4bf0e5333b477b149c3 /remote.h
parent24fbe004904f95ea07f22fea4e4c02a632149d73 (diff)
parent9eed4f3711a605ab2d9b986357879a09a6d54f36 (diff)
downloadgit-e6747627865347a534e7106bb1d14e32867b234d.tar.gz
Merge branch 'jk/push-force-with-lease-creation'
"git push --force-with-lease" already had enough logic to allow ensuring that such a push results in creation of a ref (i.e. the receiving end did not have another push from sideways that would be discarded by our force-pushing), but didn't expose this possibility to the users. It does so now. * jk/push-force-with-lease-creation: t5533: make it pass on case-sensitive filesystems push: allow pushing new branches with --force-with-lease push: add shorthand for --force-with-lease branch creation Documentation/git-push: fix placeholder formatting
Diffstat (limited to 'remote.h')
-rw-r--r--remote.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/remote.h b/remote.h
index c21fd3788c..924881169d 100644
--- a/remote.h
+++ b/remote.h
@@ -89,7 +89,6 @@ struct ref {
force:1,
forced_update:1,
expect_old_sha1:1,
- expect_old_no_trackback:1,
deletion:1,
matched:1;