mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/log-show-linear-break'

Browse Source 
Attempts to show where a single-strand-of-pearls break in "git log"
output.

* nd/log-show-linear-break:
  log: add --show-linear-break to help see non-linear history
  object.h: centralize object flag allocation
This commit is contained in:
Junio C Hamano
2014-04-03 12:38:11 -07:00
parent 2b06c1e57e 1b32decefd
commit b407d40933
14 changed files with 89 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
commit.c
View File

@ -721,7 +721,7 @@ void sort_in_topological_order(struct commit_list **list, enum rev_sort_order so
/* merge-base stuff */
/* bits #0..15 in revision.h */
/* Remember to update object flag allocation in object.h */
#define PARENT1 (1u<<16)
#define PARENT2 (1u<<17)
#define STALE (1u<<18)