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

gitweb: Optional grouping of projects by category

Sebastien Cevey committed over 15 years ago

gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)

Jakub Narebski committed over 15 years ago

gitweb: Modularized git_get_project_description to be more generic

Sebastien Cevey committed over 15 years ago

gitweb: Change the way "content tags" ('ctags') are handled

Jakub Narebski committed over 15 years ago

gitweb: Split git_project_list_body in two functions

Sebastien Cevey committed over 15 years ago

Merge branch 'maint'

Junio C Hamano committed over 15 years ago

Start 1.7.5.1 maintenance track

Junio C Hamano committed over 15 years ago

Merge branch 'mg/x-years-12-months' into maint

Junio C Hamano committed over 15 years ago

git-send-email: fix missing space in error message

Sylvain Rabot committed over 15 years ago

Mark dirstat error messages for translation

Johan Herland committed over 15 years ago

Improve error handling when parsing dirstat parameters

Johan Herland committed over 15 years ago