Junio C Hamano 66ecd2d053 Merge branch 'js/cherry-pick-usability' ...

* js/cherry-pick-usability:
  Teach commit about CHERRY_PICK_HEAD
  bash: teach __git_ps1 about CHERRY_PICK_HEAD
  Introduce CHERRY_PICK_HEAD
  t3507: introduce pristine-detach helper

2011-03-09 15:56:17 -08:00

..

add.c

Merge branch 'nd/struct-pathspec'

2011-02-27 21:17:36 -08:00

annotate.c

…

apply.c

Merge branch 'fc/apply-p2-get-header-name' into maint

2010-12-09 10:36:36 -08:00

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'jn/parse-options-extra'

2010-12-12 21:49:53 -08:00

branch.c

branch_merged: fix grammar in warning

2011-02-27 00:29:58 -08:00

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ref-format.c

…

checkout-index.c

Merge branch 'jn/git-cmd-h-bypass-setup'

2010-12-12 21:49:50 -08:00

checkout.c

Merge branch 'uk/checkout-ambiguous-ref'

2011-02-27 21:58:29 -08:00

clean.c

…

clone.c

Merge branch 'jk/fail-null-clone'

2011-03-04 15:02:26 -08:00

commit-tree.c

…

commit.c

Merge branch 'js/cherry-pick-usability'

2011-03-09 15:56:17 -08:00

config.c

Merge branch 'lp/config-vername-check'

2011-02-27 21:58:31 -08:00

count-objects.c

…

describe.c

for_each_hash: allow passing a 'void *data' pointer to callback

2011-02-18 22:25:51 -08:00

diff-files.c

Convert struct diff_options to use struct pathspec

2011-02-03 12:28:15 -08:00

diff-index.c

…

diff-tree.c

…

diff.c

Merge branch 'nd/struct-pathspec'

2011-02-27 21:17:36 -08:00

fast-export.c

Merge branch 'mg/placeholders-are-lowercase'

2011-02-27 21:58:30 -08:00

fetch-pack.c

…

fetch.c

Make <identifier> lowercase as per CodingGuidelines

2011-02-15 11:53:10 -08:00

fmt-merge-msg.c

…

for-each-ref.c

…

fsck.c

fsck: do not give up too early in fsck_dir()

2011-01-27 12:58:15 -08:00

gc.c

Merge branch 'jn/git-cmd-h-bypass-setup'

2010-12-12 21:49:50 -08:00

grep.c

grep --no-index: honor pathspecs correctly

2011-02-16 14:39:00 -08:00

hash-object.c

Make hash-object more robust against malformed objects

2011-02-07 15:05:25 -08:00

help.c

…

index-pack.c

…

init-db.c

init: remove unnecessary check

2011-03-03 15:45:10 -08:00

log.c

Convert struct diff_options to use struct pathspec

2011-02-03 12:28:15 -08:00

ls-files.c

Merge branch 'jn/git-cmd-h-bypass-setup'

2010-12-12 21:49:50 -08:00

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

Merge branch 'js/cherry-pick-usability'

2011-03-09 15:56:17 -08:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

Make <identifier> lowercase as per CodingGuidelines

2011-02-15 11:53:10 -08:00

pack-objects.c

thread-utils.h: simplify the inclusion

2010-12-10 12:58:06 -08:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

git-patch-id: do not trip over "no newline" markers

2011-02-17 11:56:50 -08:00

prune-packed.c

…

prune.c

…

push.c

push.default: Rename 'tracking' to 'upstream'

2011-02-16 10:21:52 -08:00

read-tree.c

Make <identifier> lowercase as per CodingGuidelines

2011-02-15 11:53:10 -08:00

receive-pack.c

…

reflog.c

…

remote-ext.c

remote-ext: do not segfault for blank lines

2011-01-18 10:18:25 -08:00

remote-fd.c

…

remote.c

…

replace.c

…

rerere.c

rerere "remaining"

2011-02-16 13:20:50 -08:00

reset.c

…

rev-list.c

…

rev-parse.c

…

revert.c

Merge branch 'js/cherry-pick-usability'

2011-03-09 15:56:17 -08:00

rm.c

builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.

2010-12-19 10:44:06 -08:00

send-pack.c

…

shortlog.c

parse-options: Don't call parse_options_check() so much

2010-12-06 16:51:36 -08:00

show-branch.c

…

show-ref.c

…

stripspace.c

…

symbolic-ref.c

…

tag.c

Make <identifier> lowercase as per CodingGuidelines

2011-02-15 11:53:10 -08:00

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

Convert ce_path_match() to use struct pathspec

2011-02-03 14:08:30 -08:00

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-pack.c

…

verify-tag.c

Merge branch 'mg/maint-tag-rfc1991'

2010-12-08 11:24:13 -08:00

write-tree.c

…