Junio C Hamano 5237d8e67d Merge branch 'cc/reset-keep' into next ...

* cc/reset-keep:
  reset: disallow using --keep when there are unmerged entries
  reset: disallow "reset --keep" outside a work tree
  Documentation: reset: describe new "--keep" option
  reset: add test cases for "--keep" option
  reset: add option "--keep" to "git reset"

2010-03-07 12:50:09 -08:00

..

add.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

annotate.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

apply.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

archive.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

bisect--helper.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

blame.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

branch.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

bundle.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

cat-file.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

check-attr.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

check-ref-format.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

checkout-index.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

checkout.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

clean.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

clone.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

commit-tree.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

commit.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

config.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

count-objects.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

describe.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

diff-files.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

diff-index.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

diff-tree.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

diff.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

fast-export.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

fetch-pack.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

fetch.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

fmt-merge-msg.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

for-each-ref.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

fsck.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

gc.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

grep.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

hash-object.c

Merge branch 'master' into next

2010-03-07 00:02:24 -08:00

help.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

index-pack.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

init-db.c

Merge branch 'sd/init-template' into next

2010-03-02 13:21:48 -08:00

log.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

ls-files.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

ls-remote.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

ls-tree.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

mailinfo.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

mailsplit.c

Merge branch 'sh/am-keep-cr' into next

2010-03-02 13:21:48 -08:00

merge-base.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

merge-file.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

merge-index.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

merge-ours.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

merge-recursive.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

merge-tree.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

merge.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

mktag.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

mktree.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

mv.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

name-rev.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

notes.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

pack-objects.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

pack-redundant.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

pack-refs.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

patch-id.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

prune-packed.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

prune.c

Merge branch 'as/maint-expire' into next

2010-03-02 13:21:48 -08:00

push.c

Merge branch 'ld/push-porcelain' into next

2010-03-02 13:21:47 -08:00

read-tree.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

receive-pack.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

reflog.c

Merge branch 'as/maint-expire' into next

2010-03-02 13:21:48 -08:00

remote.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

replace.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

rerere.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

reset.c

Merge branch 'cc/reset-keep' into next

2010-03-07 12:50:09 -08:00

rev-list.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

rev-parse.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

revert.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

rm.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

send-pack.c

Merge branch 'ld/push-porcelain' into next

2010-03-02 13:21:47 -08:00

shortlog.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

show-branch.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

show-ref.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

stripspace.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

symbolic-ref.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

tag.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

tar-tree.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

unpack-file.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

unpack-objects.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

update-index.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

update-ref.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

update-server-info.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

upload-archive.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

var.c

Merge branch 'lt/deepen-builtin-source' into next

2010-02-25 23:24:11 -08:00

verify-pack.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

verify-tag.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

write-tree.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00