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

Merge branch 'dl/diff-merge-base'

Browse Source 
"git diff A...B" learned "git diff --merge-base A B", which is a
longer short-hand to say the same thing.

* dl/diff-merge-base:
  contrib/completion: complete `git diff --merge-base`
  builtin/diff-tree: learn --merge-base
  builtin/diff-index: learn --merge-base
  t4068: add --merge-base tests
  diff-lib: define diff_get_merge_base()
  diff-lib: accept option flags in run_diff_index()
  contrib/completion: extract common diff/difftool options
  git-diff.txt: backtick quote command text
  git-diff-index.txt: make --cached description a proper sentence
  t4068: remove unnecessary >tmp
This commit is contained in:
Junio C Hamano
2020-11-02 13:17:39 -08:00
parent 761a4e9ab1 cce7d6ecfc
commit b6fb70c985
11 changed files with 356 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
diff.h
View File

@ -578,12 +578,17 @@ void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
*/
const char *diff_aligned_abbrev(const struct object_id *sha1, int);
void diff_get_merge_base(const struct rev_info *revs, struct object_id *mb);
/* do not report anything on removed paths */
#define DIFF_SILENT_ON_REMOVED 01
/* report racily-clean paths as modified */
#define DIFF_RACY_IS_MODIFIED 02
int run_diff_files(struct rev_info *revs, unsigned int option);
int run_diff_index(struct rev_info *revs, int cached);
#define DIFF_INDEX_CACHED 01
#define DIFF_INDEX_MERGE_BASE 02
int run_diff_index(struct rev_info *revs, unsigned int option);
int do_diff_cache(const struct object_id *, struct diff_options *);
int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int);