delta/git.git, branch jc/remote-setbranches-usage-fix

remote: fix set-branches usage

2011-11-07T05:15:30+00:00

Bad copy-paste.

Otherwise "git remote set-branches" without necessary argument
will result in an error message and help for set-url subcommand.

Signed-off-by: Junio C Hamano

Add git remote set-branches

2010-05-20T03:45:41+00:00

Add ‘git remote set-branches’ for changing the list of tracked refs
for a remote repository with one "porcelain-level" command.  This
complements the longstanding ‘git remote add --track’ option.

The interface is based on the ‘git remote set-url’ subcommand.

   git remote set-branches base --add C
   git remote set-branches base A B D
   git remote set-branches base --delete D; # not implemented

Suggested-by: martin f. krafft 
Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

Merge branch 'maint'

2010-05-19T05:39:56+00:00

* maint:
  Documentation/gitdiffcore: fix order in pickaxe description
  Documentation: fix minor inconsistency
  Documentation: rebase -i ignores options passed to "git am"
  hash_object: correction for zero length file

Documentation/gitdiffcore: fix order in pickaxe description

2010-05-19T04:55:11+00:00

Reverse the order of "origin" and "result" so that the sentence
really describes an addition rather than a removal.

Signed-off-by: Michael J Gruber 
Signed-off-by: Junio C Hamano

Documentation: fix minor inconsistency

2010-05-19T04:51:50+00:00

While we don't always write out commands in full (`git command`) we
should do it consistently in adjacent paragraphs.

Signed-off-by: Michael J Gruber 
Signed-off-by: Junio C Hamano

Documentation: rebase -i ignores options passed to "git am"

2010-05-19T04:51:40+00:00

Signed-off-by: Markus Heidelberg 
Signed-off-by: Junio C Hamano

diff-options: make --patch a synonym for -p

2010-05-19T04:50:03+00:00

Here we simply make --patch a synonym for -p, whose mnemonic was "patch"
all along.

Signed-off-by: Will Palmer 
Reviewed-by: Jeff King 
Signed-off-by: Junio C Hamano

for-each-ref: Field with abbreviated objectname

2010-05-19T04:49:04+00:00

Introduce a :short modifier to objectname which outputs the abbreviated
object name.

Signed-off-by: Michael J Gruber 
Reviewed-by: Jeff King 
Signed-off-by: Junio C Hamano

hash_object: correction for zero length file

2010-05-19T04:46:36+00:00

The check whether size is zero was done after if size <= SMALL_FILE_SIZE,
as result, zero size case was never triggered. Instead zero length file
was treated as any other small file. This did not caused any problem, but
if we have a special case for size equal to zero, it is better to make it
work and avoid redundant malloc().

Signed-off-by: Dmitry Potapov 
Signed-off-by: Junio C Hamano

gitweb: Use @diff_opts while using format-patch

2010-05-19T04:45:04+00:00

Make git-format-patch (used by 'patch' and 'patches' views) use the
same rename detection options that git-diff and git-diff-tree (used
by 'commitdiff', 'blobdiff', etc.) use.

Signed-off-by: Pavan Kumar Sunkara 
Acked-by: Jakub Narebski 
Acked-by: Giuseppe Bilotta 
Signed-off-by: Junio C Hamano