diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-03-09 13:10:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-09 13:10:50 -0800 |
| commit | b8cfe290a891611c15bbb79c412d16e57ae8784e (patch) | |
| tree | 72bd927c4d8e15dce177c98b6d0fe618c155ff20 /git-merge-ours.sh | |
| parent | Merge branch 'master' into next (diff) | |
| parent | fsck-objects: Remove --standalone (diff) | |
| download | tgif-b8cfe290a891611c15bbb79c412d16e57ae8784e.tar.xz | |
Merge branch 'jc/fsck' into next
* jc/fsck:
fsck-objects: Remove --standalone
refs.c::do_for_each_ref(): Finish error message lines with "\n"
Nicer output from 'git'
Use #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
Remove trailing dot after short description
Fix some inconsistencies in the docs
contrib/git-svn: fix a harmless warning on rebuild (with old repos)
contrib/git-svn: remove the --no-stop-on-copy flag
contrib/git-svn: fix svn compat and fetch args
Don't recurse into parents marked uninteresting.
diff-delta: bound hash list length to avoid O(m*n) behavior
test-delta needs zlib to compile
git-fmt-merge-msg cleanup
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions