Merge branch 'db/learn-HEAD'

Junio C Hamano committed over 18 years ago

Merge branch 'jn/webfeed'

Junio C Hamano committed over 18 years ago

Merge branch 'cc/help'

Junio C Hamano committed over 18 years ago

Merge branch 'dm/cherry-pick-s'

Junio C Hamano committed over 18 years ago

Merge branch 'lt/dirmatch-optim'

Junio C Hamano committed over 18 years ago

bisect: print an error message when "git rev-list --bisect-vars" fails

Christian Couder committed over 18 years ago

compat-util: avoid macro redefinition warning

Johannes Sixt committed over 18 years ago

compat/fopen.c: avoid clobbering the system defined fopen macro

Brandon Casey committed over 18 years ago

git-gui: Delete branches with 'git branch -D' to clear config

Shawn O. Pearce committed over 18 years ago

git-gui: Setup branch.remote,merge for shorthand git-pull

Shawn O. Pearce committed over 18 years ago

gitk: Make updates go faster

Paul Mackerras committed over 18 years ago

Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"

Dustin Sallings committed over 18 years ago

doc: clarify definition of "update" for git-add -u

Jeff King committed over 18 years ago

Documentation: bisect: add a few "git bisect run" examples

Christian Couder committed over 18 years ago

Documentation/config.txt: Add git-gui options

Gustaf Hendeby committed over 18 years ago

Documentation: improve "add", "pull" and "format-patch" examples

Christian Couder committed over 18 years ago

Be more careful with objects directory permissions on clone

Mark Hills committed over 18 years ago

commit: Show committer if automatic

Santi Béjar committed over 18 years ago

commit: Show author if different from committer

Santi Béjar committed over 18 years ago

Preparation to call determine_author_info from prepare_to_commit

Santi Béjar committed over 18 years ago