Junio C Hamano d4dd59844e Merge branch 'jk/pull-into-empty' into next ...

* jk/pull-into-empty:
  pull: do not clobber untracked files on initial pull
  merge: merge unborn index before setting ref

Conflicts:
	builtin/merge.c

2011-03-31 13:13:58 -07:00

..

add.c

Merge branch 'ab/i18n-st' into next

2011-03-23 14:57:37 -07:00

annotate.c

…

apply.c

Merge branch 'jc/maint-apply-report-offset'

2011-03-15 14:22:02 -07:00

archive.c

i18n: git-archive basic messages

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

bisect--helper.c

…

blame.c

standardize brace placement in struct definitions

2011-03-16 12:49:02 -07:00

branch.c

Merge branch 'ab/i18n-st' into next

2011-03-23 14:57:37 -07:00

bundle.c

i18n: git-bundle basic messages

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

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 'master' into next

2011-03-26 20:25:57 -07:00

clean.c

i18n: git-clean clean.requireForce messages

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

clone.c

Merge branch 'ab/i18n-st' into next

2011-03-23 14:57:37 -07:00

commit-tree.c

…

commit.c

Merge branch 'jc/index-update-if-able'

2011-03-26 20:13:16 -07:00

config.c

config: drop support for GIT_CONFIG_NOGLOBAL

2011-03-15 12:23:30 -07:00

count-objects.c

add description parameter to OPT__VERBOSE

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

describe.c

Merge branch 'ab/i18n-st' into next

2011-03-23 14:57:37 -07: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 'jc/index-update-if-able'

2011-03-26 20:13:16 -07:00

fast-export.c

Merge branch 'mg/placeholders-are-lowercase'

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

fetch-pack.c

Merge branch 'jc/fetch-progressive-stride'

2011-03-29 14:09:08 -07:00

fetch.c

Merge branch 'ab/i18n-st' into next

2011-03-23 14:57:37 -07:00

fmt-merge-msg.c

Fix sparse warnings

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

for-each-ref.c

…

fsck.c

Remove unused variables

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

gc.c

i18n: git-gc "Auto packing the repository" message

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

grep.c

Merge branch 'master' into next

2011-03-28 17:29:07 -07:00

hash-object.c

Fix sparse warnings

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

help.c

…

index-pack.c

Fix sparse warnings

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

init-db.c

Merge branch 'ab/i18n-st' into next

2011-03-23 14:57:37 -07:00

log.c

Merge branch 'mg/rev-list-n-parents'

2011-03-26 20:13:17 -07:00

ls-files.c

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

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

ls-remote.c

get_remote_url(): use the same data source as ls-remote to get remote urls

2011-03-02 12:26:53 -08:00

ls-tree.c

…

mailinfo.c

commit: helper methods to reduce redundant blocks of code

2010-11-04 13:53:34 -07:00

mailsplit.c

…

merge-base.c

…

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

Fix sparse warnings

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

merge.c

Merge branch 'jk/pull-into-empty' into next

2011-03-31 13:13:58 -07:00

mktag.c

Merge branch 'jn/maint-c99-format'

2011-03-23 14:55:46 -07:00

mktree.c

…

mv.c

i18n: git-mv "bad" messages

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

name-rev.c

…

notes.c

Merge branch 'ab/i18n-st' into next

2011-03-23 14:57:37 -07:00

pack-objects.c

thread-utils.h: simplify the inclusion

2010-12-10 12:58:06 -08: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

Fix sparse warnings

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

prune-packed.c

…

prune.c

add description parameter to OPT__DRY_RUN

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

push.c

Merge branch 'ab/i18n-st' into next

2011-03-23 14:57:37 -07:00

read-tree.c

Make <identifier> lowercase as per CodingGuidelines

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

receive-pack.c

Merge branch 'jc/maint-fetch-alt'

2011-03-22 21:37:53 -07:00

reflog.c

…

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

Fix sparse warnings

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

replace.c

…

rerere.c

rerere forget: deprecate invocation without pathspec

2011-03-02 12:26:18 -08:00

reset.c

Merge branch 'ab/i18n-st' into next

2011-03-23 14:57:37 -07:00

rev-list.c

revision.c: introduce --min-parents and --max-parents options

2011-03-23 10:16:44 -07:00

rev-parse.c

revision.c: introduce --min-parents and --max-parents options

2011-03-23 10:16:44 -07:00

revert.c

Merge branch 'ab/i18n-st' into next

2011-03-23 14:57:37 -07:00

rm.c

i18n: git-rm basic messages

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

send-pack.c

Fix sparse warnings

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

shortlog.c

i18n: git-shortlog basic messages

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

show-branch.c

commit: Add commit_list prefix in two function names.

2010-11-29 14:01:52 -08: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 'ab/i18n-st' into next

2011-03-23 14:57:37 -07:00

tar-tree.c

…

unpack-file.c

Fix sparse warnings

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

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

add OPT__FORCE

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

upload-archive.c

…

var.c

Fix sparse warnings

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

verify-pack.c

…

verify-tag.c

Merge branch 'mg/maint-tag-rfc1991'

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

write-tree.c

…