Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jn/fast-import-subtree' | Junio C Hamano | 2010-08-18 | 3 | -11/+75 |
|\ | |||||
| * | Teach fast-import to import subtrees named by tree id | Jonathan Nieder | 2010-07-05 | 3 | -11/+75 |
* | | Merge branch 'ar/string-list-foreach' | Junio C Hamano | 2010-08-18 | 5 | -104/+67 |
|\ \ | |||||
| * | | Convert the users of for_each_string_list to for_each_string_list_item macro | Alex Riesen | 2010-07-05 | 4 | -103/+64 |
| * | | Add a for_each_string_list_item macro | Alex Riesen | 2010-07-05 | 1 | -1/+3 |
| |/ | |||||
* | | Merge branch 'jh/graph-next-line' | Junio C Hamano | 2010-08-18 | 2 | -23/+55 |
|\ \ | |||||
| * | | Enable custom schemes for column colors in the graph API | Johan Herland | 2010-07-13 | 2 | -11/+43 |
| * | | Make graph_next_line() available in the graph.h API | Johan Herland | 2010-07-13 | 2 | -12/+12 |
* | | | Merge branch 'tr/xsize-bits' | Junio C Hamano | 2010-08-18 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | xsize_t: check whether we lose bits | Thomas Rast | 2010-07-28 | 1 | -0/+2 |
* | | | | Merge branch 'tc/checkout-B' | Junio C Hamano | 2010-08-18 | 4 | -9/+218 |
|\ \ \ \ | |||||
| * | | | | builtin/checkout: handle -B from detached HEAD correctly | Tay Ray Chuan | 2010-08-09 | 2 | -1/+7 |
| * | | | | builtin/checkout: learn -B | Tay Ray Chuan | 2010-06-25 | 3 | -7/+88 |
| * | | | | builtin/checkout: reword hint for -b | Tay Ray Chuan | 2010-06-25 | 1 | -1/+2 |
| * | | | | add tests for checkout -b | Tay Ray Chuan | 2010-06-25 | 1 | -0/+121 |
* | | | | | mergetool: Skip autoresolved paths | David Aguilar | 2010-08-17 | 2 | -17/+57 |
* | | | | | git-svn: fix fetch with deleted tag | David D. Kilzer | 2010-08-15 | 3 | -2/+99 |
* | | | | | git-svn: fix regex to remove "tail" from svn tags | David D. Kilzer | 2010-08-15 | 1 | -1/+1 |
* | | | | | Merge branch 'jc/sha1-name-find-fix' | Junio C Hamano | 2010-08-12 | 1 | -10/+11 |
|\ \ \ \ \ | |||||
| * | | | | | sha1_name.c: fix parsing of ":/token" syntax | Junio C Hamano | 2010-08-02 | 1 | -10/+11 |
* | | | | | | Merge branch 'jn/doc-pull' | Junio C Hamano | 2010-08-12 | 1 | -11/+54 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation: flesh out “git pull” description | Jonathan Nieder | 2010-08-02 | 1 | -11/+54 |
* | | | | | | | Merge branch 'jn/maint-gitweb-dynconf' | Junio C Hamano | 2010-08-12 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | gitweb: allow configurations that change with each request | Jonathan Nieder | 2010-08-02 | 1 | -4/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'bc/use-more-hardlinks-in-install' | Junio C Hamano | 2010-08-12 | 1 | -3/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Makefile: make hard/symbolic links for non-builtins too | Brandon Casey | 2010-07-25 | 1 | -3/+6 |
| * | | | | | | | Makefile: link builtins residing in bin directory to main git binary too | Brandon Casey | 2010-07-25 | 1 | -0/+6 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'tr/rfc-reset-doc' | Junio C Hamano | 2010-08-12 | 1 | -169/+178 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Documentation/reset: move "undo permanently" example behind "make topic" | Thomas Rast | 2010-07-19 | 1 | -13/+13 |
| * | | | | | | | Documentation/reset: reorder examples to match description | Thomas Rast | 2010-07-19 | 1 | -23/+23 |
| * | | | | | | | Documentation/reset: promote 'examples' one section up | Thomas Rast | 2010-07-19 | 1 | -107/+109 |
| * | | | | | | | Documentation/reset: separate options by mode | Thomas Rast | 2010-07-19 | 1 | -26/+33 |
| * | | | | | | | Documentation/git-reset: reorder modes for soft-mixed-hard progression | Thomas Rast | 2010-07-19 | 1 | -6/+6 |
* | | | | | | | | Merge branch 'jn/parse-date-basic' | Junio C Hamano | 2010-08-12 | 2 | -8/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Export parse_date_basic() to convert a date string to timestamp | Jonathan Nieder | 2010-07-15 | 2 | -8/+7 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'sp/fix-smart-http-deadlock-on-error' | Junio C Hamano | 2010-08-12 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | smart-http: Don't deadlock on server failure | Shawn O. Pearce | 2010-08-06 | 1 | -2/+3 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-08-12 | 8 | -13/+21 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | push: mention "git pull" in error message for non-fast forwards | Matthieu Moy | 2010-08-12 | 1 | -2/+2 |
| * | | | | | | | | | Standardize do { ... } while (0) style | Jonathan Nieder | 2010-08-12 | 4 | -10/+10 |
| * | | | | | | | | | t/t7003: replace \t with literal tab in sed expression | Brandon Casey | 2010-08-12 | 1 | -1/+1 |
| * | | | | | | | | | index-pack: Don't follow replace refs. | Nelson Elhage | 2010-08-12 | 2 | -0/+8 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-08-11 | 6 | -7/+130 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | post-receive-email: remove spurious commas in email subject | Matthieu Moy | 2010-08-11 | 1 | -1/+1 |
| * | | | | | | | | | fast-import: export correctly marks larger than 2^20-1 | Raja R Harinath | 2010-08-11 | 2 | -1/+58 |
| * | | | | | | | | | t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATH | Ævar Arnfjörð Bjarmason | 2010-08-11 | 1 | -3/+2 |
| * | | | | | | | | | diff: strip extra "/" when stripping prefix | Jakub Narebski | 2010-08-11 | 2 | -2/+69 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-08-09 | 17 | -41/+123 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | gitweb: clarify search results page when no matching commit found | Jonathan Nieder | 2010-08-09 | 1 | -4/+5 |
| * | | | | | | | | | Documentation: add a FILES section for show-ref | Jonathan Nieder | 2010-08-09 | 1 | -1/+7 |