From: Junio C Hamano <junkio@cox.net>
Date: Wed, 28 Feb 2007 22:18:57 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~115
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1db8b60b2a6ef0cc0f7cc7d0783b7cda2ce894ca;p=git.git

Merge branch 'maint'

* maint:
  Start preparing Release Notes for 1.5.0.3
  Documentation: git-remote add [-t <branch>] [-m <branch>] [-f] name url
  Include config.mak in doc/Makefile
  git.el: Set the default commit coding system from the repository config.
  git-archimport: support empty summaries, put summary on a single line.
  http-push.c::lock_remote(): validate all remote refs.
  git-cvsexportcommit: don't cleanup .msg if not yet committed to cvs.
---

1db8b60b2a6ef0cc0f7cc7d0783b7cda2ce894ca
diff --cc Documentation/git-remote.txt
index 266faade3,f96b30429..a9fb6a9a5
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@@ -10,10 -10,9 +10,10 @@@ SYNOPSI
  --------
  [verse]
  'git-remote'
- 'git-remote' add <name> <url>
+ 'git-remote' add [-t <branch>] [-m <branch>] [-f] <name> <url>
  'git-remote' show <name>
  'git-remote' prune <name>
 +'git-remote' update [group]
  
  DESCRIPTION
  -----------