diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-26 03:29:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-26 03:29:09 -0700 |
| commit | b8ed7f0f40743dae6111c8950ba55051933298ca (patch) | |
| tree | ff4ebce0cdaf2c9c493eb38fd22f8e9d8d705bc0 /Documentation/git-merge.txt | |
| parent | test-dump-cache-tree: report number of subtrees. (diff) | |
| parent | commit-tree: allow generic object name for the tree as well. (diff) | |
| download | tgif-b8ed7f0f40743dae6111c8950ba55051933298ca.tar.xz | |
Merge branch 'master' into jc/cache-tree
* master:
commit-tree: allow generic object name for the tree as well.
Makefile: remove and create xdiff library from scratch.
t0000-basic: Add ls-tree recursive test back.
Libified diff-index: backward compatibility fix.
Libify diff-index.
Libify diff-files.
Makefile: remove and create libgit.a from scratch.
Document the configuration file
Document git-var -l listing also configuration variables
rev-parse: better error message for ambiguous arguments
make update-index --chmod work with multiple files and --stdin
socksetup: don't return on set_reuse_addr() error
Fix "git show --stat"
git-update-index --unresolve
Add git-unresolve <paths>...
Add colordiff for git to contrib/colordiff.
gitk: Let git-rev-list do the argument list parsing
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions