diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-21 08:24:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-21 08:24:45 (GMT) |
| commit | ad9f72a7042e22d871c7c6441e8b220b7142d40f (patch) | |
| tree | e8406e084272930a6c2cfb6c8452ad55d29aa1a5 /git-merge-octopus.sh | |
| parent | 69d830d1a3a1236036bd0f84dd9794d7c8d34b3f (diff) | |
| parent | 4170af82328e50a75723cee084ae779e7a882b9d (diff) | |
| download | git-ad9f72a7042e22d871c7c6441e8b220b7142d40f.zip git-ad9f72a7042e22d871c7c6441e8b220b7142d40f.tar.gz git-ad9f72a7042e22d871c7c6441e8b220b7142d40f.tar.bz2 | |
Merge branch 'master' into next
* master:
checkout -f: do not leave untracked working tree files.
Log peer address when git-daemon called from inetd
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions