Junio C Hamano d25a265220 Merge branch 'nd/maint-autofix-tag-in-head' into maint ...

* nd/maint-autofix-tag-in-head:
  Accept tags in HEAD or MERGE_HEAD
  merge: remove global variable head[]
  merge: use return value of resolve_ref() to determine if HEAD is invalid
  merge: keep stash[] a local variable

Conflicts:
	builtin/merge.c

2011-10-21 10:49:26 -07:00

..

add.c

Merge branch 'ci/commit--interactive-atomic'

2011-05-16 16:47:10 -07:00

annotate.c

…

apply.c

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

2011-10-21 10:49:26 -07:00

archive.c

Merge branch 'il/archive-err-signal' into maint

2011-10-21 10:49:25 -07:00

bisect--helper.c

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

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

blame.c

blame: add --line-porcelain output format

2011-05-09 15:27:50 -07:00

branch.c

Merge branch 'ci/forbid-unwanted-current-branch-update'

2011-09-16 21:48:10 -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

git-check-attr: Normalize paths

2011-08-04 15:57:18 -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 'jc/checkout-from-tree-keep-local-changes' into maint

2011-10-21 10:49: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

Sync with 1.7.3.2

2010-10-21 17:16:10 -07:00

commit.c

Merge branch 'nd/maint-autofix-tag-in-head' into maint

2011-10-21 10:49:26 -07:00

config.c

Merge branch 'mm/maint-config-explicit-bool-display' into maint

2011-10-21 10:49:24 -07:00

count-objects.c

add description parameter to OPT__VERBOSE

2010-11-15 09:56:51 -08:00

describe.c

describe: Refresh the index when run with --dirty

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

diff-files.c

Convert struct diff_options to use struct pathspec

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

diff-index.c

Submodules: Use "ignore" settings from .gitmodules too for diff and status

2010-08-09 09:11:44 -07:00

diff-tree.c

diffcore-rename: fall back to -C when -C -C busts the rename limit

2011-03-22 14:29:07 -07:00

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 'nd/decorate-grafts'

2011-08-28 21:22:58 -07:00

fetch.c

fetch: skip on-demand checking when no submodules are configured

2011-09-09 13:59:20 -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: fix objectname:short bug

2010-08-26 16:42:25 -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' into maint

2011-10-15 20:46:37 -07:00

hash-object.c

index_fd(): turn write_object and format_check arguments into one flag

2011-05-09 11:58:19 -07:00

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

ls-remote: the --exit-code option reports "no matching refs"

2011-05-18 14:37:46 -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

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

merge-base.c

Documentation: update to git-merge-base --octopus

2011-04-15 10:13:52 -07:00

merge-file.c

Merge branch 'rs/opt-help-text'

2010-11-24 15:55:19 -08:00

merge-index.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

merge-ours.c

…

merge-recursive.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

merge-tree.c

sparse: Fix an "symbol 'merge_file' not decared" warning

2011-04-11 10:35:25 -07:00

merge.c

Merge branch 'nd/maint-autofix-tag-in-head' into maint

2011-10-21 10:49:26 -07:00

mktag.c

read_sha1_file(): get rid of read_sha1_file_repl() madness

2011-05-15 15:23:33 -07:00

mktree.c

…

mv.c

i18n: git-mv "bad" messages

2011-03-09 23:52:56 -08:00

name-rev.c

object.h: Add OBJECT_ARRAY_INIT macro and make use of it.

2010-08-29 22:42:49 -07:00

notes.c

notes remove: --stdin reads from the standard input

2011-05-19 10:54:16 -07:00

pack-objects.c

Merge branch 'mh/check-attr-relative'

2011-08-17 17:36:22 -07:00

pack-redundant.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

pack-refs.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

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

add description parameter to OPT__DRY_RUN

2010-11-15 09:57:37 -08:00

push.c

push: Don't push a repository with unpushed submodules

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

read-tree.c

Teach read-tree the -n|--dry-run option

2011-05-25 15:04:25 -07:00

receive-pack.c

Sync with 1.7.6.2

2011-09-06 11:42:12 -07:00

reflog.c

reflog: actually default to subcommand 'show'

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

remote-ext.c

Remove unused variables

2011-03-22 11:43:27 -07:00

remote-fd.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

remote.c

Merge branch 'maint'

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

replace.c

…

rerere.c

rerere: libify rerere_clear() and rerere_gc()

2011-05-08 12:55:34 -07:00

reset.c

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

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

rev-list.c

Merge branch 'jk/format-patch-am'

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

rev-parse.c

show: --ignore-missing

2011-05-19 10:55:54 -07:00

revert.c

Merge branch 'jn/plug-empty-tree-leak'

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

rm.c

i18n: git-rm basic messages

2011-03-09 23:52:56 -08:00

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

Describe various forms of "be quiet" using OPT__QUIET

2010-11-15 10:04:56 -08:00

stripspace.c

…

symbolic-ref.c

Describe various forms of "be quiet" using OPT__QUIET

2010-11-15 10:04:56 -08:00

tag.c

Merge branch 'jk/tag-contains-ab' (early part) into maint

2011-09-11 21:54:32 -07:00

tar-tree.c

…

unpack-file.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

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

add OPT__FORCE

2010-11-15 10:04:43 -08:00

upload-archive.c

upload-archive: allow user to turn off filters

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

var.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

verify-pack.c

verify-pack: use index-pack --verify

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

verify-tag.c

Merge branch 'mg/maint-tag-rfc1991'

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

write-tree.c

…