svn: initial "master" points to trunk if possible

Eric Wong committed over 17 years ago

Merge branch 'maint'

Junio C Hamano committed over 17 years ago

Merge branch 'maint-1.6.3' into maint

Junio C Hamano committed over 17 years ago

push: point to 'git pull' and 'git push --force' in case of non-fast forward

Matthieu Moy committed over 17 years ago

Documentation: add: <filepattern>... is optional

Paul Bolle committed over 17 years ago

Change mentions of "git programs" to "git commands"

Ori Avtalion committed over 17 years ago

Documentation: merge: one <remote> is required

Paul Bolle committed over 17 years ago

help.c: give correct structure's size to memset()

Johan Herland committed over 17 years ago

allow pull --rebase on branch yet to be born

Jeff King committed over 17 years ago

sort assertion to make it more generic

Amiel Martin committed over 17 years ago

fixed order of assertion in tests

Amiel Martin committed over 17 years ago

block-sha1: support for architectures with memory alignment restrictions

Nicolas Pitre committed over 17 years ago

block-sha1: split the different "hacks" to be individually selected

Nicolas Pitre committed over 17 years ago

block-sha1: move code around

Nicolas Pitre committed over 17 years ago

git-gui: Update russian translation

Alex Riesen committed over 17 years ago

git-gui: Limit display to a maximum number of files

Dan Zwell committed over 17 years ago

Prevent diff machinery from examining assume-unchanged entries on worktree

Nguyễn Thái Ngọc Duy committed over 17 years ago

Merge branch 'maint'

Junio C Hamano committed over 17 years ago

Merge branch 'maint-1.6.3' into maint

Junio C Hamano committed over 17 years ago

Merge branch 'jk/push-quiet'

Junio C Hamano committed over 17 years ago