summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/pager-per-command'Junio C Hamano2010-12-083-10/+52
|\
| * allow command-specific pagers in pager.<cmd>Jeff King2010-11-173-10/+52
* | Merge branch 'jk/maint-decorate-01-bool'Junio C Hamano2010-12-082-2/+23
|\ \ | |/
| * log.decorate: accept 0/1 bool valuesJeff King2010-11-172-2/+23
* | Merge branch 'gc/http-with-non-ascii-username-url'Junio C Hamano2010-12-085-1/+51
|\ \
| * | Fix username and password extraction from HTTP URLsGabriel Corona2010-11-172-2/+12
| * | t5550: test HTTP authentication and userinfo decodingGabriel Corona2010-11-174-0/+40
| |/
* | Merge branch 'ks/maint-getenv-fix'Junio C Hamano2010-12-081-0/+1
|\ \
| * | setup: make sure git_dir path is in a permanent buffer, getenv(3) caseKirill Smelkov2010-11-121-0/+1
* | | Merge branch 'gb/gitweb-remote-heads'Junio C Hamano2010-12-083-8/+268
|\ \ \
| * | | git instaweb: enable remote_headsGiuseppe Bilotta2010-11-171-0/+2
| * | | gitweb: group remote heads by remoteGiuseppe Bilotta2010-11-172-20/+152
| * | | gitweb: provide a routine to display (sub)sectionsGiuseppe Bilotta2010-11-171-0/+38
| * | | gitweb: refactor repository URL printingGiuseppe Bilotta2010-11-171-1/+6
| * | | gitweb: remotes view for a single remoteGiuseppe Bilotta2010-11-171-4/+26
| * | | gitweb: allow action specialization in page headerGiuseppe Bilotta2010-11-171-1/+9
| * | | gitweb: nagivation menu for tags, heads and remotesGiuseppe Bilotta2010-11-171-3/+16
| * | | gitweb: separate heads and remotes listsGiuseppe Bilotta2010-11-171-4/+27
| * | | gitweb: git_get_heads_list accepts an optional list of refsGiuseppe Bilotta2010-11-171-4/+7
| * | | gitweb: introduce remote_heads featureGiuseppe Bilotta2010-11-171-2/+16
| * | | gitweb: use fullname as hash_base in heads linkGiuseppe Bilotta2010-11-171-1/+1
* | | | Merge branch 'mg/maint-tag-rfc1991'Junio C Hamano2010-12-085-20/+88
|\ \ \ \
| * | | | tag: recognize rfc1991 signaturesMichael J Gruber2010-11-102-7/+9
| * | | | tag: factor out sig detection for tag displayMichael J Gruber2010-11-101-2/+2
| * | | | tag: factor out sig detection for body editsMichael J Gruber2010-11-101-10/+2
| * | | | verify-tag: factor out signature detectionMichael J Gruber2010-11-103-8/+16
| * | | | t/t7004-tag: test handling of rfc1991 signaturesMichael J Gruber2010-11-101-0/+66
* | | | | Merge branch 'jh/notes-merge'Junio C Hamano2010-12-0820-162/+3794
|\ \ \ \ \
| * | | | | Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland2010-11-173-3/+351
| * | | | | cmd_merge(): Parse options before checking MERGE_HEADJohan Herland2010-11-171-16/+17
| * | | | | Provide 'git notes get-ref' to easily retrieve current notes refJohan Herland2010-11-173-0/+47
| * | | | | git notes merge: Add testcases for merging notes trees at different fanoutsJohan Herland2010-11-171-0/+436
| * | | | | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-177-4/+248
| * | | | | git notes merge: --commit should fail if underlying notes ref has movedJohan Herland2010-11-172-2/+85
| * | | | | git notes merge: List conflicting notes in notes merge commit messageJohan Herland2010-11-174-3/+24
| * | | | | git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-175-4/+394
| * | | | | git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-175-13/+474
| * | | | | Documentation: Preliminary docs on 'git notes merge'Johan Herland2010-11-171-1/+43
| * | | | | git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland2010-11-174-2/+559
| * | | | | git notes merge: Handle real, non-conflicting notes mergesJohan Herland2010-11-174-11/+532
| * | | | | builtin/notes.c: Refactor creation of notes commits.Johan Herland2010-11-174-24/+47
| * | | | | git notes merge: Initial implementation handling trivial merges onlyJohan Herland2010-11-175-0/+392
| * | | | | builtin/notes.c: Split notes ref DWIMmery into a separate functionJohan Herland2010-11-171-6/+11
| * | | | | notes.c: Use two newlines (instead of one) when concatenating notesJohan Herland2010-11-175-3/+15
| * | | | | (trivial) t3303: Indent with tabs instead of spaces for consistencyJohan Herland2010-11-171-9/+9
| * | | | | notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondJohan Herland2010-11-174-37/+43
| * | | | | notes.h/c: Allow combine_notes functions to remove notesJohan Herland2010-11-102-2/+26
| * | | | | notes.c: Reorder functions in preparation for next commitJohan Herland2010-11-101-73/+73
| * | | | | notes.h: Make default_notes_ref() available in notes APIJohan Herland2010-11-102-1/+15
| * | | | | (trivial) notes.h: Minor documentation fixes to copy_notes()Johan Herland2010-11-101-0/+5
View Lorry Controller Status