Junio C Hamano 278f7e6f6d Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pick-head-after-punted ...

* js/maint-no-cherry-pick-head-after-punted:
  cherry-pick: do not give irrelevant advice when cherry-pick punted
  revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so

Conflicts:
	builtin/revert.c

2011-10-06 17:02:11 -07:00

..

add.c

…

annotate.c

…

apply.c

zlib: zlib can only process 4GB at a time

2011-06-10 11:52:15 -07:00

archive.c

upload-archive: allow user to turn off filters

2011-06-22 11:12:35 -07:00

bisect--helper.c

bisect: introduce support for --no-checkout option.

2011-08-04 15:34:32 -07:00

blame.c

…

branch.c

Merge branch 'mg/branch-list'

2011-10-05 12:36:23 -07:00

bundle.c

Teach progress eye-candy to fetch_refs_from_bundle()

2011-09-19 11:07:21 -07:00

cat-file.c

plug a few coverity-spotted leaks

2011-06-20 14:27:36 -07:00

check-attr.c

Teach '--cached' option to check-attr

2011-09-22 16:38:22 -07:00

check-ref-format.c

check-ref-format --print: Normalize refnames that start with slashes

2011-08-25 13:39:38 -07:00

checkout-index.c

checkout-index: remove obsolete comment

2011-08-17 10:39:47 -07:00

checkout.c

Merge branch 'jk/argv-array'

2011-10-05 12:36:24 -07:00

clean.c

Documentation: clarify "git clean -e <pattern>"

2011-08-28 23:47:55 -07:00

clone.c

Merge branch 'nd/maint-clone-gitdir'

2011-08-28 21:20:28 -07:00

commit-tree.c

…

commit.c

Merge branch 'jk/color-and-pager'

2011-08-28 21:19:16 -07:00

config.c

config: refactor get_colorbool function

2011-08-19 15:51:37 -07:00

count-objects.c

…

describe.c

describe: Refresh the index when run with --dirty

2011-08-11 13:03:35 -07:00

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

want_color: automatically fallback to color.ui

2011-08-19 15:51:38 -07:00

fast-export.c

Merge branch 'jk/fast-export-quote-path' into maint

2011-08-16 12:41:12 -07:00

fetch-pack.c

Merge branch 'jc/fetch-pack-fsck-objects'

2011-10-05 12:36:20 -07:00

fetch.c

Merge branch 'jc/receive-verify'

2011-10-05 12:36:21 -07:00

fmt-merge-msg.c

…

for-each-ref.c

for-each-ref: add split message parts to %(contents:*).

2011-09-08 13:56:19 -07:00

fsck.c

fsck: do not abort upon finding an empty blob

2011-09-11 18:03:38 -07:00

gc.c

builtin/gc.c: add missing newline in message

2011-06-19 14:46:39 -07:00

grep.c

Merge branch 'nm/grep-object-sha1-lock'

2011-10-05 12:35:53 -07:00

hash-object.c

…

help.c

…

index-pack.c

Merge branch 'jc/zlib-wrap' into maint

2011-08-16 11:23:26 -07:00

init-db.c

read_gitfile_gently(): rename misnamed function to read_gitfile()

2011-08-22 14:04:56 -07:00

log.c

format-patch: ignore ui.color

2011-09-12 11:43:58 -07:00

ls-files.c

Merge branch 'cb/maint-ls-files-error-report'

2011-08-23 15:34:31 -07:00

ls-remote.c

Merge branch 'jc/ls-remote-short-help'

2011-10-05 12:36:26 -07:00

ls-tree.c

Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.

2011-07-25 10:50:11 -07:00

mailinfo.c

mailinfo: always clean up rfc822 header folding

2011-05-26 14:13:38 -07:00

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

Merge branch 'jc/want-commit'

2011-10-05 12:35:55 -07:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

…

pack-objects.c

Merge branch 'jc/fetch-verify'

2011-10-05 12:36:20 -07:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

patch-id.c: use strbuf instead of a fixed buffer

2011-09-22 09:35:07 -07:00

prune-packed.c

…

prune.c

…

push.c

push: Don't push a repository with unpushed submodules

2011-08-20 23:03:52 -07:00

read-tree.c

…

receive-pack.c

Merge branch 'jc/run-receive-hook-cleanup'

2011-10-05 12:36:22 -07:00

reflog.c

reflog: actually default to subcommand 'show'

2011-08-01 10:52:34 -07:00

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'maint'

2011-08-25 16:00:07 -07:00

replace.c

…

rerere.c

…

reset.c

Merge branch 'jk/reset-reflog-message-fix' into maint

2011-09-11 22:33:20 -07:00

rev-list.c

rev-list --verify-object

2011-09-01 15:46:13 -07:00

rev-parse.c

…

revert.c

Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pick-head-after-punted

2011-10-06 17:02:11 -07:00

rm.c

…

send-pack.c

Revert "Merge branch 'cb/maint-quiet-push' into maint"

2011-09-06 11:10:41 -07:00

shortlog.c

Merge branch 'jk/format-patch-am'

2011-05-31 12:19:11 -07:00

show-branch.c

want_color: automatically fallback to color.ui

2011-08-19 15:51:38 -07:00

show-ref.c

…

stripspace.c

…

symbolic-ref.c

…

tag.c

Merge branch 'mg/branch-list'

2011-10-05 12:36:23 -07:00

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

zlib: zlib can only process 4GB at a time

2011-06-10 11:52:15 -07:00

update-index.c

plug a few coverity-spotted leaks

2011-06-20 14:27:36 -07:00

update-ref.c

update-ref: whitespace fix

2011-08-25 14:42:11 -07:00

update-server-info.c

…

upload-archive.c

upload-archive: allow user to turn off filters

2011-06-22 11:12:35 -07:00

var.c

…

verify-pack.c

verify-pack: use index-pack --verify

2011-06-05 22:45:38 -07:00

verify-tag.c

…

write-tree.c

…