Junio C Hamano 046c5e572b Merge branch 'cb/maint-orphan-merge-noclobber' into next ...

* cb/maint-orphan-merge-noclobber:
  do not overwrite untracked during merge from unborn branch

Conflicts:
	t/t7607-merge-overwrite.sh

2010-11-15 11:02:14 -08:00

..

add.c

git add: Add the "--ignore-missing" option for the dry run

2010-07-12 15:13:54 -07:00

annotate.c

…

apply.c

apply: don't segfault on binary files with missing data

2010-10-29 14:13:33 -07:00

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'ks/no-textconv-symlink' into next

2010-11-05 11:39:07 -07:00

branch.c

Merge branch 'sm/branch-broken-ref'

2010-06-21 06:02:47 -07:00

bundle.c

Use angles for placeholders consistently

2010-10-08 12:29:52 -07:00

cat-file.c

blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''

2010-09-29 16:53:25 -07:00

check-attr.c

…

check-ref-format.c

Allow "check-ref-format --branch" from subdirectory

2010-08-06 10:01:45 -07:00

checkout-index.c

Fix {update,checkout}-index usage strings

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

checkout.c

Merge branch 'master' into next

2010-09-27 15:19:53 -07:00

clean.c

builtin/clean.c: Use STRING_LIST_INIT_NODUP.

2010-09-06 16:56:51 -07:00

clone.c

clone: warn users --depth is ignored in local clones

2010-08-24 09:28:02 -07:00

commit-tree.c

Merge branch 'sn/doc-opt-notation' into next

2010-10-13 20:23:08 -07:00

commit.c

Merge branch 'jn/fix-abbrev' into maint

2010-08-20 12:53:09 -07:00

config.c

Merge branch 'jn/paginate-fix'

2010-08-31 16:23:31 -07:00

count-objects.c

…

describe.c

Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maint

2010-06-16 16:21:15 -07:00

diff-files.c

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

2010-08-09 09:11:44 -07: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

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

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

diff.c

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

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

fast-export.c

Merge branch 'en/d-f-conflict-fix'

2010-09-08 08:54:01 -07:00

fetch-pack.c

…

fetch.c

Use parentheses and `...' where appropriate

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

fmt-merge-msg.c

Merge branch 'rr/fmt-merge-msg'

2010-09-29 13:48:20 -07:00

for-each-ref.c

for-each-ref: fix objectname:short bug

2010-08-26 16:42:25 -07:00

fsck.c

…

gc.c

…

grep.c

Use angles for placeholders consistently

2010-10-08 12:29:52 -07:00

hash-object.c

…

help.c

Cast execl*() NULL sentinels to (char *)

2010-07-25 23:14:18 -07:00

index-pack.c

Use parentheses and `...' where appropriate

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

init-db.c

init: plug tiny one-time memory leak

2010-10-06 10:46:05 -07:00

log.c

Merge branch 'rr/format-patch-count-without-merges'

2010-09-29 13:49:09 -07:00

ls-files.c

Use parentheses and `...' where appropriate

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

ls-remote.c

ls-remote: run setup_git_directory_gently() sooner

2010-08-15 20:00:02 -07:00

ls-tree.c

Use angles for placeholders consistently

2010-10-08 12:29:52 -07:00

mailinfo.c

enums: omit trailing comma for portability

2010-05-31 16:59:27 -07:00

mailsplit.c

Use parentheses and `...' where appropriate

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

merge-base.c

merge-base --independent to print reduced parent list in a merge

2010-08-18 14:02:03 -07:00

merge-file.c

merge-file: correctly find files when called in subdir

2010-10-18 16:10:57 -07:00

merge-index.c

…

merge-ours.c

…

merge-recursive.c

Merge branch 'jf/merge-ignore-ws' into next

2010-09-22 09:35:59 -07:00

merge-tree.c

merge-tree: fix where two branches share no changes

2010-07-14 12:56:49 -07:00

merge.c

Merge branch 'cb/maint-orphan-merge-noclobber' into next

2010-11-15 11:02:14 -08:00

mktag.c

…

mktree.c

…

mv.c

string_list: Add STRING_LIST_INIT macro and make use of it.

2010-07-05 11:47:57 -07: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: Don't create (empty) commit when removing non-existing notes

2010-08-31 11:07:34 -07:00

pack-objects.c

Put a space between `<' and argument in pack-objects usage string

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

pack-redundant.c

…

pack-refs.c

…

patch-id.c

patch-id: Add support for mbox format

2010-04-19 13:01:49 -07:00

prune-packed.c

…

prune.c

prune: allow --dry-run for -n and --verbose for -v

2010-08-09 10:13:18 -07:00

push.c

Merge branch 'maint'

2010-08-12 18:07:09 -07:00

read-tree.c

read-tree: deprecate syntax without tree-ish args

2010-09-10 08:37:14 -07:00

receive-pack.c

Merge branch 'tr/receive-pack-aliased-update-fix' into maint

2010-07-07 10:25:15 -07:00

reflog.c

Merge branch 'jc/maint-no-reflog-expire-unreach-for-head'

2010-05-21 04:02:18 -07:00

remote-ext.c

git-remote-ext

2010-10-13 16:09:28 -07:00

remote-fd.c

git-remote-fd

2010-10-13 16:09:26 -07:00

remote.c

Use parentheses and `...' where appropriate

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

replace.c

…

rerere.c

Merge branch 'jn/merge-renormalize'

2010-09-03 09:43:41 -07:00

reset.c

reset: suggest what to do upon "git reset --mixed <paths>"

2010-08-21 23:17:35 -07:00

rev-list.c

Merge branch 'jk/maint-rev-list-nul' into next

2010-11-05 11:39:06 -07:00

rev-parse.c

Merge branch 'maint'

2010-07-07 11:18:26 -07:00

revert.c

builtin/revert.c: don't dereference a NULL pointer

2010-09-27 10:39:54 -07:00

rm.c

…

send-pack.c

Merge branch 'jk/push-progress' into next

2010-11-05 11:39:07 -07:00

shortlog.c

shortlog: run setup_git_directory_gently() sooner

2010-08-11 09:24:01 -07:00

show-branch.c

Use parentheses and `...' where appropriate

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

show-ref.c

string_list: Add STRING_LIST_INIT macro and make use of it.

2010-07-05 11:47:57 -07:00

stripspace.c

…

symbolic-ref.c

…

tag.c

tag -v: use RUN_GIT_CMD to run verify-tag

2010-04-17 12:40:19 -07:00

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

do not depend on signed integer overflow

2010-10-06 11:10:07 -07:00

update-index.c

Fix {update,checkout}-index usage strings

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

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

var.c

var: run setup_git_directory_gently() sooner

2010-08-15 20:00:02 -07:00

verify-pack.c

…

verify-tag.c

…

write-tree.c

…