diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-19 16:12:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-19 16:12:57 -0700 |
| commit | 60571f75ab81f9e1d5a5f351ac07f6d86a461230 (patch) | |
| tree | eeae35ba6480dcd50b9d02abb70eedd09ba95937 /.gitignore | |
| parent | 2c4a03290ba3395b4006d8ff5d1f2fa8f23584fa (diff) | |
| parent | ec167793d84ba7b765e1eb71b0257ce7baca2d26 (diff) | |
| download | git-60571f75ab81f9e1d5a5f351ac07f6d86a461230.tar.gz | |
Merge branch 'jc/unresolve' into next
* jc/unresolve:
Add git-unresolve <paths>...
get_tree_entry(): make it available from tree-walk
sha1_name.c: no need to include diff.h; tree-walk.h will do.
sha1_name.c: prepare to make get_tree_entry() reusable from others.
pre-commit hook: complain about conflict markers.
git-merge: a bit more readable user guidance.
diff: move diff.c to diff-lib.c to make room.
git log: don't do merge diffs by default
Allow "git repack" users to specify repacking window/depth
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 145f8555ad..a536f32497 100644 --- a/.gitignore +++ b/.gitignore @@ -111,6 +111,7 @@ git-tag git-tar-tree git-unpack-file git-unpack-objects +git-unresolve git-update-index git-update-ref git-update-server-info |