diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-20 14:20:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-20 14:20:17 -0800 |
| commit | 63c4b4c5c1335cca263d7a9ab4e6cfe5fd03dfec (patch) | |
| tree | f80ceee80d5a651285197295056038c86d24447e /commit.c | |
| parent | e035ce939d7e26afee4936ed32f1db9428ac026e (diff) | |
| parent | 8dce82356221df894a1b0dd5a4189ad3169a5069 (diff) | |
| download | git-63c4b4c5c1335cca263d7a9ab4e6cfe5fd03dfec.tar.gz git-63c4b4c5c1335cca263d7a9ab4e6cfe5fd03dfec.tar.xz | |
Merge branch 'jc/leftright'
* jc/leftright:
Revert "Make left-right automatic."
Make left-right automatic.
Teach all of log family --left-right output.
rev-list --left-right
Diffstat (limited to 'commit.c')
| -rw-r--r-- | commit.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -868,11 +868,11 @@ void sort_in_topological_order_fn(struct commit_list ** list, int lifo, /* merge-rebase stuff */ -/* bits #0..7 in revision.h */ -#define PARENT1 (1u<< 8) -#define PARENT2 (1u<< 9) -#define STALE (1u<<10) -#define RESULT (1u<<11) +/* bits #0..15 in revision.h */ +#define PARENT1 (1u<<16) +#define PARENT2 (1u<<17) +#define STALE (1u<<18) +#define RESULT (1u<<19) static struct commit *interesting(struct commit_list *list) { |