Merge branch 'gb/maint-gitweb-esc-param' into maint

Junio C Hamano committed almost 17 years ago

Merge branch 'jn/gitweb-patch' into maint

Junio C Hamano committed almost 17 years ago

Documentation: clarify 'ours' merge strategy

Thomas Rast committed almost 17 years ago

Update 'git remote update' usage string to match man page.

Tim Henigan committed almost 17 years ago

make git version dynamic when building documentation

Ben Walton committed almost 17 years ago

add installation support to Makefile

Ben Walton committed almost 17 years ago

Oops, forgot a COPYING file. It's GPLv2.

Avery Pennarun committed almost 17 years ago

Merge branch 'maint'

Junio C Hamano committed almost 17 years ago

remote: fix use-after-free error detected by glibc in ref_remove_duplicates

Julian Phillips committed almost 17 years ago

Makefile: Ensure rpm packages can be read by older rpm versions

Todd Zullinger committed almost 17 years ago

bash: add the merge option --ff-only

Björn Gustavsson committed about 17 years ago

gitweb: Make 'history' view (re)use git_log_generic()

Jakub Narebski committed almost 17 years ago

gitweb: Refactor common parts of 'log' and 'shortlog' views

Jakub Narebski committed almost 17 years ago

gitweb: Refactor 'log' action generation, adding git_log_body()

Jakub Narebski committed almost 17 years ago

git svn: add authorsfile test case for ~/.gitconfig

Eric Wong committed almost 17 years ago

git svn: read global+system config for clone+init

Eric Wong committed almost 17 years ago

git svn: handle SVN merges from revisions past the tip of the branch

Toby Allsopp committed almost 17 years ago

gitk: Default to the system colours on Windows

Pat Thoyts committed about 17 years ago

gitk: Merge branch 'dev' into master

Paul Mackerras committed almost 17 years ago

gitk: Update Japanese translation

Mizar committed almost 17 years ago