diff options
author | Junio C Hamano <junkio@cox.net> | 2007-03-04 17:24:49 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-03-04 17:24:49 -0800 |
commit | 784b11cd05e7862b0fbcc1251a65669c7004a8df (patch) | |
tree | 9a5b637e3237a020d066b1fa19b96828b6008d8c /diff-lib.c | |
parent | git-svn: fix show-ignore when not connected to the repository root (diff) | |
parent | GIT 1.5.0.3 (diff) | |
download | tgif-784b11cd05e7862b0fbcc1251a65669c7004a8df.tar.xz |
Merge branch 'maint'
* maint:
GIT 1.5.0.3
glossary: Add definitions for dangling and unreachable objects
user-manual: more detailed merge discussion
user-manual: how to replace commits older than most recent
user-manual: insert earlier of mention content-addressable architecture
user-manual: ensure generated manual references stylesheet
user-manual: reset to ORIG_HEAD not HEAD to undo merge
Documentation: mention module option to git-cvsimport
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions