diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-24 22:31:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-24 22:31:15 -0700 |
| commit | 5a6a8c0e012137a3f0059be40ec7b2f4aa614355 (patch) | |
| tree | 842b775b4a96a35e98372e3073f314b8c6d2ff08 /git-resolve.sh | |
| parent | Merge branch 'jc/cache-tree' into next (diff) | |
| parent | split the diff-delta interface (diff) | |
| download | tgif-5a6a8c0e012137a3f0059be40ec7b2f4aa614355.tar.xz | |
Merge branch 'np/delta' into next
* np/delta:
split the diff-delta interface
Document the configuration file
Document git-var -l listing also configuration variables
rev-parse: better error message for ambiguous arguments
Diffstat (limited to 'git-resolve.sh')
0 files changed, 0 insertions, 0 deletions