Junio C Hamano d1e3f9e7fa Merge branch 'mg/status-b' into next ...

* mg/status-b:
  Documentation+t5708: document and test status -s -b
  Show branch information in short output of git status

Conflicts:
	wt-status.h

2010-06-07 22:15:45 -07:00

..

add.c

Rewrite dynamic structure initializations to runtime assignment

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

annotate.c

…

apply.c

Merge branch 'gv/portable' into next

2010-06-03 15:18:08 -07:00

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'master' into next

2010-06-07 22:15:36 -07:00

branch.c

enums: omit trailing comma for portability

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

bundle.c

…

cat-file.c

Rewrite dynamic structure initializations to runtime assignment

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

check-attr.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'gv/portable' into next

2010-06-03 15:18:08 -07:00

clean.c

…

clone.c

Merge branch 'ph/clone-message-reword' into next

2010-05-21 04:04:40 -07:00

commit-tree.c

make commit_tree a library function

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

commit.c

Merge branch 'mg/status-b' into next

2010-06-07 22:15:45 -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

Rewrite dynamic structure initializations to runtime assignment

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

fmt-merge-msg.c

merge: --log appends shortlog to message if specified

2010-05-10 12:02:20 -07:00

for-each-ref.c

Merge branch 'maint'

2010-06-07 22:15:31 -07:00

fsck.c

…

gc.c

…

grep.c

Merge branch 'rs/grep-binary' into next

2010-06-03 15:18:10 -07:00

hash-object.c

Merge branch 'lt/deepen-builtin-source'

2010-03-10 15:25:18 -08:00

help.c

enums: omit trailing comma for portability

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

index-pack.c

Merge branch 'np/index-pack-memsave'

2010-05-21 04:02:19 -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: print URL when no repo is specified

2010-05-11 22:55:44 -07:00

ls-tree.c

ls: remove redundant logic

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

mailinfo.c

enums: omit trailing comma for portability

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

mailsplit.c

Merge branch 'sh/am-keep-cr'

2010-03-10 15:32:34 -08:00

merge-base.c

…

merge-file.c

Merge branch 'rs/diff-no-minimal' into next

2010-05-09 15:28:14 -07:00

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

Merge branch 'rs/diff-no-minimal' into next

2010-05-09 15:28:14 -07:00

merge.c

Merge branch 'tc/merge-m-log' into next

2010-05-21 04:04:40 -07:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

notes: dry-run and verbose options for prune

2010-05-19 23:57:18 -07:00

pack-objects.c

Merge branch 'js/try-to-free-stackable' into next

2010-05-21 04:04:39 -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

Merge branch 'lt/deepen-builtin-source'

2010-03-10 15:25:18 -08:00

push.c

Merge branch 'maint'

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

read-tree.c

…

receive-pack.c

Merge branch 'gv/portable' into next

2010-06-03 15:18:08 -07:00

reflog.c

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

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

remote.c

Merge branch 'jn/remote-set-branches' into next

2010-06-03 15:18:10 -07:00

replace.c

…

rerere.c

Merge branch 'rs/diff-no-minimal' into next

2010-05-09 15:28:14 -07:00

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

Merge branch 'lt/deepen-builtin-source'

2010-03-10 15:25:18 -08:00

revert.c

Merge branch 'cc/revert-strategy'

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

rm.c

…

send-pack.c

Merge branch 'ld/push-porcelain'

2010-03-15 00:58:24 -07:00

shortlog.c

Merge branch 'jn/shortlog'

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

show-branch.c

show-branch: use DEFAULT_ABBREV instead of 7

2010-05-25 09:48:49 -07:00

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

Merge branch 'lt/deepen-builtin-source'

2010-03-10 15:25:18 -08:00

verify-pack.c

…

verify-tag.c

…

write-tree.c

…