diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2012-02-28 12:23:26 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2012-02-28 12:23:26 +0800 |
| commit | 508d1244dc8d38188c70e98207efa8a97d16b47c (patch) | |
| tree | fc8688b80be453755f8135df11bf1db2d247725a /remote.h | |
| parent | 0ad9e96d2e2f42f4d2ce7cd612bf741913242bc0 (diff) | |
| parent | 25a7850a106ed0f27b88b8ce0b89fd326120dff4 (diff) | |
| download | git-508d1244dc8d38188c70e98207efa8a97d16b47c.tar.gz | |
Merge branch 'master' into git-po
Diffstat (limited to 'remote.h')
| -rw-r--r-- | remote.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -145,7 +145,8 @@ int branch_merge_matches(struct branch *, int n, const char *); enum match_refs_flags { MATCH_REFS_NONE = 0, MATCH_REFS_ALL = (1 << 0), - MATCH_REFS_MIRROR = (1 << 1) + MATCH_REFS_MIRROR = (1 << 1), + MATCH_REFS_PRUNE = (1 << 2) }; /* Reporting of tracking info */ |