Junio C Hamano a660534e06 Merge branch 'jc/maint-no-reflog-expire-unreach-for-head' ...

* jc/maint-no-reflog-expire-unreach-for-head:
  reflog --expire-unreachable: special case entries in "HEAD" reflog
  more war on "sleep" in tests
  Document gc.<pattern>.reflogexpire variables

Conflicts:
	Documentation/config.txt

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

..

add.c

…

annotate.c

…

apply.c

Merge branch 'bg/apply-blank-trailing-context'

2010-05-08 22:37:41 -07:00

archive.c

…

bisect--helper.c

…

blame.c

…

branch.c

…

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'em/checkout-orphan'

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

clean.c

…

clone.c

Merge branch 'sr/remote-helper-export'

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

commit-tree.c

make commit_tree a library function

2010-04-01 23:53:54 -07:00

commit.c

Merge branch 'jc/status-show-ignored'

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

config.c

Allow passing of configuration parameters in the command line

2010-03-28 09:48:25 -07:00

count-objects.c

…

describe.c

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

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

diff-files.c

…

diff-index.c

…

diff-tree.c

Merge branch 'pb/log-first-parent-p-m'

2010-03-24 16:25:39 -07:00

diff.c

…

fast-export.c

Merge branch 'maint'

2010-03-28 17:42:58 -07:00

fetch-pack.c

…

fetch.c

Merge branch 'maint'

2010-04-09 22:43:18 -07:00

fmt-merge-msg.c

fmt-merge-msg: hide summary option

2010-03-24 19:45:31 -07:00

for-each-ref.c

for-each-ref: Field with abbreviated objectname

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

fsck.c

…

gc.c

…

grep.c

Merge branch 'np/malloc-threading'

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

hash-object.c

…

help.c

…

index-pack.c

Merge branch 'maint'

2010-05-01 20:23:10 -07:00

init-db.c

handle "git --bare init <dir>" properly

2010-05-10 11:25:37 -07:00

log.c

Merge branch 'sd/log-decorate'

2010-05-08 22:36:14 -07:00

ls-files.c

ls: remove redundant logic

2010-03-21 16:23:44 -07:00

ls-remote.c

ls-remote: fall-back to default remotes when no remote specified

2010-04-08 23:10:43 -07:00

ls-tree.c

ls: remove redundant logic

2010-03-21 16:23:44 -07:00

mailinfo.c

Teach mailinfo %< as an alternative scissors mark

2010-04-04 10:17:55 -07:00

mailsplit.c

…

merge-base.c

…

merge-file.c

merge-file --diff3: add a label for ancestor

2010-03-20 20:36:11 -07:00

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

Merge branch 'cc/revert-strategy'

2010-05-08 22:34:47 -07:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

Merge branch 'sb/notes-parse-opt'

2010-03-28 21:52:28 -07:00

pack-objects.c

Merge branch 'np/malloc-threading'

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

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

push.c

Merge branch 'maint'

2010-04-09 22:43:18 -07:00

read-tree.c

…

receive-pack.c

…

reflog.c

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

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

remote.c

…

replace.c

…

rerere.c

…

reset.c

Sync with 1.7.0.4

2010-03-31 15:14:27 -07:00

rev-list.c

Merge branch 'ef/maint-empty-commit-log'

2010-04-06 14:50:46 -07:00

rev-parse.c

…

revert.c

Merge branch 'cc/revert-strategy'

2010-05-08 22:34:47 -07:00

rm.c

…

send-pack.c

…

shortlog.c

…

show-branch.c

…

show-ref.c

…

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

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-pack.c

…

verify-tag.c

…

write-tree.c

…