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

Merge branch 'tr/notes-display'

Browse Source 
* tr/notes-display:
  git-notes(1): add a section about the meaning of history
  notes: track whether notes_trees were changed at all
  notes: add shorthand --ref to override GIT_NOTES_REF
  commit --amend: copy notes to the new commit
  rebase: support automatic notes copying
  notes: implement helpers needed for note copying during rewrite
  notes: implement 'git notes copy --stdin'
  rebase -i: invoke post-rewrite hook
  rebase: invoke post-rewrite hook
  commit --amend: invoke post-rewrite hook
  Documentation: document post-rewrite hook
  Support showing notes from more than one notes tree
  test-lib: unset GIT_NOTES_REF to stop it from influencing tests

Conflicts:
	git-am.sh
	refs.c
This commit is contained in:
Junio C Hamano
2010-03-24 16:26:43 -07:00
parent b6a7a06aa6 66d6819984
commit a86ed83cce
25 changed files with 1366 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
revision.h
View File

@ -3,6 +3,7 @@
#include "parse-options.h"
#include "grep.h"
#include "notes.h"
#define SEEN (1u<<0)
#define UNINTERESTING (1u<<1)
@ -20,6 +21,7 @@
struct rev_info;
struct log_info;
struct string_list;
struct rev_info {
/* Starting list */
@ -126,6 +128,9 @@ struct rev_info {
struct reflog_walk_info *reflog_info;
struct decoration children;
struct decoration merge_simplification;
/* notes-specific options: which refs to show */
struct display_notes_opt notes_opt;
};
#define REV_TREE_SAME 0