git, branch v1.8.3-rc0

Git 1.8.3-rc0

2013-04-26T22:45:09Z

Signed-off-by: Junio C Hamano

Merge branch 'rr/shortlog-doc'

2013-04-26T22:28:39Z

Update documentation for "log" and "shortlog". * rr/shortlog-doc: builtin/shortlog.c: make usage string consistent with log builtin/log.c: make usage string consistent with doc git-shortlog.txt: make SYNOPSIS match log, update OPTIONS git-log.txt: rewrite note on why "--" may be required git-log.txt: generalize .. git-log.txt: order OPTIONS properly; move .. revisions.txt: clarify the .. and ... syntax git-shortlog.txt: remove (-h|--help) from OPTIONS

Merge branch 'th/bisect-skipped-log'

2013-04-26T22:28:37Z

* th/bisect-skipped-log: bisect: Log possibly bad, skipped commits at bisection end

Merge branch 'ph/rebase-original'

2013-04-26T22:28:34Z

* ph/rebase-original: rebase: find orig_head unambiguously

Merge branch 'jn/glossary-revision'

2013-04-26T22:28:23Z

The wording for "revision" in the glossary wanted to say it refers to "commit (noun) as a concept" but it was badly phrased. This may need further updates to hint that in contexts where it is clear, the word may refer to an object name, not necessarily a commit. But the patch as-is is already an improvement. * jn/glossary-revision: glossary: a revision is just a commit

Merge branch 'jc/add-ignore-removal'

2013-04-26T22:28:09Z

Introduce "--ignore-removal" as a synonym to "--no-all" for "git add", and improve the 2.0 migration warning with it. * jc/add-ignore-removal: git add: rephrase -A/--no-all warning git add: --ignore-removal is a better named --no-all

remote-bzr: strip extra newline

2013-04-26T22:20:27Z

It's added by fast-export, the user didn't type it. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

remote-bzr: tell bazaar to be quiet

2013-04-26T22:20:27Z

Otherwise we get notification, progress bars, and what not. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

remote-bzr: store converted URL

2013-04-26T22:20:27Z

Bazaar might convert the URL to something more appropriate, like an absolute path. Lets store that instead of the original URL, which won't work from a different working directory if it's relative. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

remote-hg: use hashlib instead of hg sha1 util

2013-04-26T22:20:27Z

To be in sync with remote-bzr. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano