git notes merge: Add automatic conflict resolvers (ours, theirs, union)

Johan Herland committed almost 16 years ago

git notes merge: Handle real, non-conflicting notes merges

Johan Herland committed almost 16 years ago

builtin/notes.c: Refactor creation of notes commits.

Johan Herland committed almost 16 years ago

git notes merge: Initial implementation handling trivial merges only

Johan Herland committed almost 16 years ago

builtin/notes.c: Split notes ref DWIMmery into a separate function

Johan Herland committed almost 16 years ago

notes.c: Use two newlines (instead of one) when concatenating notes

Johan Herland committed almost 16 years ago

(trivial) t3303: Indent with tabs instead of spaces for consistency

Johan Herland committed almost 16 years ago

notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond

Johan Herland committed almost 16 years ago

Merge branch 'mz/maint-rebase-X-fix' into maint

Junio C Hamano committed almost 16 years ago

Documentation/git-pull: clarify configuration

Martin von Zweigbergk committed almost 16 years ago

Document that rev-list --graph triggers parent rewriting.

Yann Dirson committed almost 16 years ago

Fix username and password extraction from HTTP URLs

Gabriel Corona committed almost 16 years ago

t5550: test HTTP authentication and userinfo decoding

Gabriel Corona committed almost 16 years ago

git instaweb: enable remote_heads

Giuseppe Bilotta committed almost 16 years ago

gitweb: group remote heads by remote

Giuseppe Bilotta committed almost 16 years ago

gitweb: provide a routine to display (sub)sections

Giuseppe Bilotta committed almost 16 years ago

gitweb: refactor repository URL printing

Giuseppe Bilotta committed almost 16 years ago

gitweb: remotes view for a single remote

Giuseppe Bilotta committed almost 16 years ago

gitweb: allow action specialization in page header

Giuseppe Bilotta committed almost 16 years ago

gitweb: nagivation menu for tags, heads and remotes

Giuseppe Bilotta committed almost 16 years ago