Merge branch 'hv/config-from-blob' into maint

Junio C Hamano committed about 13 years ago

Merge branch 'maint-1.8.3' into maint

Junio C Hamano committed about 13 years ago

Merge branch 'maint-1.8.2' into maint-1.8.3

Junio C Hamano committed about 13 years ago

add: lift the pathspec magic restriction on "add -p"

Nguyễn Thái Ngọc Duy committed about 13 years ago

pathspec: catch prepending :(prefix) on pathspec with short magic

Nguyễn Thái Ngọc Duy committed about 13 years ago

Documentation/git-merge.txt: fix formatting of example block

Andreas Schwab committed about 13 years ago

typofix: commit is spelled with two ems

Junio C Hamano committed about 13 years ago

glossary: fix and clarify the definition of 'ref'

Richard Hansen committed about 13 years ago

revisions.txt: fix and clarify <rev>^{<type>}

Richard Hansen committed about 13 years ago

glossary: more precise definition of tree-ish (a.k.a. treeish)

Richard Hansen committed about 13 years ago

use 'commit-ish' instead of 'committish'

Richard Hansen committed about 13 years ago

use 'tree-ish' instead of 'treeish'

Richard Hansen committed about 13 years ago

glossary: define commit-ish (a.k.a. committish)

Richard Hansen committed about 13 years ago

glossary: mention 'treeish' as an alternative to 'tree-ish'

Richard Hansen committed about 13 years ago

submodule: don't print status output with ignore=all

Brian M. Carlson committed about 13 years ago

pull: allow pull to preserve merges when rebasing

Stephen Haberman committed about 13 years ago

Update draft release notes after merging the first batch of topics

Junio C Hamano committed about 13 years ago

Merge branch 'sb/parseopt-boolean-removal'

Junio C Hamano committed about 13 years ago

Merge branch 'jc/parseopt-command-modes'

Junio C Hamano committed about 13 years ago

Merge branch 'jl/some-submodule-config-are-not-boolean'

Junio C Hamano committed about 13 years ago