| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'il/remote-fd-ext' | Junio C Hamano | 2010-12-08 | 11 | -0/+837 |
| |\ |
|
| | * | remote-fd/ext: finishing touches after code review | Ilari Liusvaara | 2010-11-19 | 5 | -18/+21 |
| | * | git-remote-ext | Ilari Liusvaara | 2010-10-13 | 6 | -0/+377 |
| | * | git-remote-fd | Ilari Liusvaara | 2010-10-13 | 6 | -0/+142 |
| | * | Add bidirectional_transfer_loop() | Ilari Liusvaara | 2010-10-13 | 3 | -0/+317 |
| * | | Merge branch 'jk/pager-per-command' | Junio C Hamano | 2010-12-08 | 3 | -10/+52 |
| |\ \ |
|
| | * | | allow command-specific pagers in pager.<cmd> | Jeff King | 2010-11-17 | 3 | -10/+52 |
| * | | | Merge branch 'jk/maint-decorate-01-bool' | Junio C Hamano | 2010-12-08 | 2 | -2/+23 |
| |\ \ \
| |/ / |
|
| | * | | log.decorate: accept 0/1 bool values | Jeff King | 2010-11-17 | 2 | -2/+23 |
| * | | | Merge branch 'gc/http-with-non-ascii-username-url' | Junio C Hamano | 2010-12-08 | 5 | -1/+51 |
| |\ \ \ |
|
| | * | | | Fix username and password extraction from HTTP URLs | Gabriel Corona | 2010-11-17 | 2 | -2/+12 |
| | * | | | t5550: test HTTP authentication and userinfo decoding | Gabriel Corona | 2010-11-17 | 4 | -0/+40 |
| | |/ / |
|
| * | | | Merge branch 'ks/maint-getenv-fix' | Junio C Hamano | 2010-12-08 | 1 | -0/+1 |
| |\ \ \ |
|
| | * | | | setup: make sure git_dir path is in a permanent buffer, getenv(3) case | Kirill Smelkov | 2010-11-12 | 1 | -0/+1 |
| * | | | | Merge branch 'gb/gitweb-remote-heads' | Junio C Hamano | 2010-12-08 | 3 | -8/+268 |
| |\ \ \ \ |
|
| | * | | | | git instaweb: enable remote_heads | Giuseppe Bilotta | 2010-11-17 | 1 | -0/+2 |
| | * | | | | gitweb: group remote heads by remote | Giuseppe Bilotta | 2010-11-17 | 2 | -20/+152 |
| | * | | | | gitweb: provide a routine to display (sub)sections | Giuseppe Bilotta | 2010-11-17 | 1 | -0/+38 |
| | * | | | | gitweb: refactor repository URL printing | Giuseppe Bilotta | 2010-11-17 | 1 | -1/+6 |
| | * | | | | gitweb: remotes view for a single remote | Giuseppe Bilotta | 2010-11-17 | 1 | -4/+26 |
| | * | | | | gitweb: allow action specialization in page header | Giuseppe Bilotta | 2010-11-17 | 1 | -1/+9 |
| | * | | | | gitweb: nagivation menu for tags, heads and remotes | Giuseppe Bilotta | 2010-11-17 | 1 | -3/+16 |
| | * | | | | gitweb: separate heads and remotes lists | Giuseppe Bilotta | 2010-11-17 | 1 | -4/+27 |
| | * | | | | gitweb: git_get_heads_list accepts an optional list of refs | Giuseppe Bilotta | 2010-11-17 | 1 | -4/+7 |
| | * | | | | gitweb: introduce remote_heads feature | Giuseppe Bilotta | 2010-11-17 | 1 | -2/+16 |
| | * | | | | gitweb: use fullname as hash_base in heads link | Giuseppe Bilotta | 2010-11-17 | 1 | -1/+1 |
| * | | | | | Merge branch 'mg/maint-tag-rfc1991' | Junio C Hamano | 2010-12-08 | 5 | -20/+88 |
| |\ \ \ \ \ |
|
| | * | | | | | tag: recognize rfc1991 signatures | Michael J Gruber | 2010-11-10 | 2 | -7/+9 |
| | * | | | | | tag: factor out sig detection for tag display | Michael J Gruber | 2010-11-10 | 1 | -2/+2 |
| | * | | | | | tag: factor out sig detection for body edits | Michael J Gruber | 2010-11-10 | 1 | -10/+2 |
| | * | | | | | verify-tag: factor out signature detection | Michael J Gruber | 2010-11-10 | 3 | -8/+16 |
| | * | | | | | t/t7004-tag: test handling of rfc1991 signatures | Michael J Gruber | 2010-11-10 | 1 | -0/+66 |
| * | | | | | | Merge branch 'jh/notes-merge' | Junio C Hamano | 2010-12-08 | 20 | -162/+3794 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Provide 'git merge --abort' as a synonym to 'git reset --merge' | Johan Herland | 2010-11-17 | 3 | -3/+351 |
| | * | | | | | | cmd_merge(): Parse options before checking MERGE_HEAD | Johan Herland | 2010-11-17 | 1 | -16/+17 |
| | * | | | | | | Provide 'git notes get-ref' to easily retrieve current notes ref | Johan Herland | 2010-11-17 | 3 | -0/+47 |
| | * | | | | | | git notes merge: Add testcases for merging notes trees at different fanouts | Johan Herland | 2010-11-17 | 1 | -0/+436 |
| | * | | | | | | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" | Johan Herland | 2010-11-17 | 7 | -4/+248 |
| | * | | | | | | git notes merge: --commit should fail if underlying notes ref has moved | Johan Herland | 2010-11-17 | 2 | -2/+85 |
| | * | | | | | | git notes merge: List conflicting notes in notes merge commit message | Johan Herland | 2010-11-17 | 4 | -3/+24 |
| | * | | | | | | git notes merge: Manual conflict resolution, part 2/2 | Johan Herland | 2010-11-17 | 5 | -4/+394 |
| | * | | | | | | git notes merge: Manual conflict resolution, part 1/2 | Johan Herland | 2010-11-17 | 5 | -13/+474 |
| | * | | | | | | Documentation: Preliminary docs on 'git notes merge' | Johan Herland | 2010-11-17 | 1 | -1/+43 |
| | * | | | | | | git notes merge: Add automatic conflict resolvers (ours, theirs, union) | Johan Herland | 2010-11-17 | 4 | -2/+559 |
| | * | | | | | | git notes merge: Handle real, non-conflicting notes merges | Johan Herland | 2010-11-17 | 4 | -11/+532 |
| | * | | | | | | builtin/notes.c: Refactor creation of notes commits. | Johan Herland | 2010-11-17 | 4 | -24/+47 |
| | * | | | | | | git notes merge: Initial implementation handling trivial merges only | Johan Herland | 2010-11-17 | 5 | -0/+392 |
| | * | | | | | | builtin/notes.c: Split notes ref DWIMmery into a separate function | Johan Herland | 2010-11-17 | 1 | -6/+11 |
| | * | | | | | | notes.c: Use two newlines (instead of one) when concatenating notes | Johan Herland | 2010-11-17 | 5 | -3/+15 |
| | * | | | | | | (trivial) t3303: Indent with tabs instead of spaces for consistency | Johan Herland | 2010-11-17 | 1 | -9/+9 |
