diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-05-21 18:42:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-21 18:42:35 -0700 |
| commit | f95c6780c244e90abf87222126ad3b4bb18a504e (patch) | |
| tree | ede18dbb8b33e330f3837209a489f7737df2dc25 /git-merge.sh | |
| parent | Merge branch 'maint-1.5.1' into maint (diff) | |
| parent | git-status: respect core.excludesFile (diff) | |
| download | tgif-f95c6780c244e90abf87222126ad3b4bb18a504e.tar.xz | |
Merge branch 'maint-1.5.1' into maint
* maint-1.5.1:
git-status: respect core.excludesFile
SubmittingPatches: mention older C compiler compatibility
git-daemon: don't ignore pid-file write failure
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions