Junio C Hamano 0941d60545 Merge branch 'rs/pending' ...

* rs/pending:
  commit: factor out clear_commit_marks_for_object_array
  checkout: use leak_pending flag
  bundle: use leak_pending flag
  bisect: use leak_pending flag
  revision: add leak_pending flag
  checkout: use add_pending_{object,sha1} in orphan check
  revision: factor out add_pending_sha1
  checkout: check for "Previous HEAD" notice in t2020

Conflicts:
	builtin/checkout.c
	revision.c

2011-10-13 19:03:22 -07:00

..

add.c

…

annotate.c

…

apply.c

Merge branch 'jc/apply-blank-at-eof-fix'

2011-10-13 19:03:20 -07:00

archive.c

…

bisect--helper.c

…

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

…

check-attr.c

Teach '--cached' option to check-attr

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

check-ref-format.c

Change check_refname_format() to reject unnormalized refnames

2011-10-05 13:45:30 -07:00

checkout-index.c

checkout-index: remove obsolete comment

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

checkout.c

Merge branch 'rs/pending'

2011-10-13 19:03:22 -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 'nd/maint-autofix-tag-in-head'

2011-10-13 19:03:19 -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 'mh/check-ref-format-3'

2011-10-10 15:56:18 -07:00

fetch.c

Merge branch 'jc/receive-verify'

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

fmt-merge-msg.c

Accept tags in HEAD or MERGE_HEAD

2011-09-18 14:11:40 -07:00

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

…

grep.c

Merge branch 'bw/grep-no-index-no-exclude'

2011-10-13 19:03:18 -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/common-prefix-unification'

2011-10-10 15:56:17 -07:00

ls-remote.c

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

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

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 'nd/maint-autofix-tag-in-head'

2011-10-13 19:03:19 -07:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

name-rev: split usage string

2011-10-03 11:55:57 -07:00

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 'mh/check-ref-format-3'

2011-10-10 15:56:18 -07:00

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'mz/remote-rename'

2011-10-10 15:56:17 -07:00

replace.c

Change check_ref_format() to take a flags argument

2011-10-05 13:45:29 -07:00

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

rev-parse: add option --resolve-git-dir <path>

2011-08-16 11:04:31 -07:00

revert.c

Merge branch 'jc/parse-options-boolean'

2011-10-12 12:34:15 -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

…

show-branch.c

want_color: automatically fallback to color.ui

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

show-ref.c

Change check_ref_format() to take a flags argument

2011-10-05 13:45:29 -07:00

stripspace.c

…

symbolic-ref.c

…

tag.c

Merge branch 'mh/check-ref-format-3'

2011-10-10 15:56:18 -07:00

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

update-ref: whitespace fix

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

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-pack.c

…

verify-tag.c

…

write-tree.c

…