Merge branch 'jk/notes-ui-updates'

Junio C Hamano committed over 15 years ago

Merge branch 'ab/i18n-fixup'

Junio C Hamano committed over 15 years ago

Merge branch 'nm/submodule-update-force'

Junio C Hamano committed over 15 years ago

Merge branch 'jh/notes-add-ui'

Junio C Hamano committed over 15 years ago

Merge branch 'nd/maint-setup'

Junio C Hamano committed over 15 years ago

Merge branch 'mz/maint-rename-unmerged'

Junio C Hamano committed over 15 years ago

Documentation: clarify meaning of --html-path, --man-path, and --info-path

Jonathan Nieder committed over 15 years ago

git: add --info-path and --man-path options

Jon Seymour committed over 15 years ago

Update draft release notes to 1.7.6

Junio C Hamano committed over 15 years ago

Merge branch 'rs/strbuf-setlen-assert'

Junio C Hamano committed over 15 years ago

Merge branch 'vh/git-svn-doc'

Junio C Hamano committed over 15 years ago

Pass empty file to p4merge where no base is suitable.

Ciaran Jessup committed over 15 years ago

Look for password in both CVS and CVSNT password files.

Guy Rouillier committed over 15 years ago

merge-one-file: fix broken merges with alternate work trees

Jeff King committed over 15 years ago

add tests for merge-index / merge-one-file

Jeff King committed over 15 years ago

"add -p": work-around an old laziness that does not coalesce hunks

Junio C Hamano committed over 15 years ago

add--interactive.perl: factor out repeated --recount option

Junio C Hamano committed over 15 years ago

t3701: Editing a split hunk in an "add -p" session

Junio C Hamano committed over 15 years ago

add -p: 'q' should really quit

Junio C Hamano committed over 15 years ago

gitweb: Restructure projects list generation

Jakub Narebski committed over 15 years ago