global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 02:43:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/leftright' into next

Browse Source 
* jc/leftright:
  Make left-right automatic.
  Teach all of log family --left-right output.
  rev-list --left-right
  markup fix in svnimport documentation.
  Documentation: new option -P for git-svnimport
  Fix mis-mark-up in git-merge-file.txt documentation
  Default GIT_COMMITTER_NAME to login name in recieve-pack.
  Fix check_file_directory_conflict().
  git-add: remove conflicting entry when adding.
  update-index: make D/F conflict error a bit more verbose.
This commit is contained in:
Junio C Hamano
2006-12-17 10:36:25 -08:00
parent 83c5ac2d07 5761231975
commit d55fdfa731
12 changed files with 95 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
commit.c
View File

@@ -902,11 +902,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)
{