Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | pretty: Initialize notes if %N is used | Johannes Gilger | 2010-04-13 | 3 | -5/+46 |
* | Git 1.7.1-rc1v1.7.1-rc1 | Junio C Hamano | 2010-04-10 | 1 | -1/+4 |
* | Merge branch 'mr/gitweb-jsmin' | Junio C Hamano | 2010-04-10 | 7 | -36/+83 |
|\ | |||||
| * | gitweb: update INSTALL to use shorter make target | Mark Rada | 2010-04-02 | 1 | -9/+7 |
| * | gitweb: add documentation to INSTALL regarding gitweb.js | Mark Rada | 2010-04-02 | 1 | -10/+13 |
| * | instaweb: add minification awareness | Mark Rada | 2010-04-02 | 2 | -4/+14 |
| * | Gitweb: add autoconfigure support for minifiers | Mark Rada | 2010-04-02 | 3 | -16/+22 |
| * | Gitweb: add support for minifying gitweb.css | Mark Rada | 2010-04-02 | 4 | -14/+43 |
| * | Gitweb: add ignore and clean rules for minified files | Mark Rada | 2010-04-02 | 2 | -1/+2 |
* | | Merge branch 'jl/maint-submodule-gitfile-awareness' | Junio C Hamano | 2010-04-10 | 3 | -17/+47 |
|\ \ | |||||
| * | | Teach diff --submodule and status to handle .git files in submodules | Jens Lehmann | 2010-04-10 | 3 | -17/+47 |
* | | | Merge branch 'maint' | Junio C Hamano | 2010-04-09 | 5 | -14/+11 |
|\ \ \ | |||||
| * | | | Let check_preimage() use memset() to initialize "struct checkout" | Jens Lehmann | 2010-04-09 | 1 | -4/+1 |
| * | | | Merge branch 'ef/maint-empty-commit-log' into maint | Junio C Hamano | 2010-04-09 | 2 | -1/+13 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jc/conflict-marker-size' into maint | Junio C Hamano | 2010-04-09 | 2 | -14/+33 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' into maint | Junio C Hamano | 2010-04-09 | 1 | -7/+11 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'mg/maint-send-email-lazy-editor' into maint | Junio C Hamano | 2010-04-09 | 1 | -1/+4 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'rr/imap-send-unconfuse-from-line' into maint | Junio C Hamano | 2010-04-09 | 2 | -8/+10 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'rb/maint-python-path' into maint | Junio C Hamano | 2010-04-09 | 5 | -4/+9 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'gh/maint-stash-show-error-message' into maint | Junio C Hamano | 2010-04-09 | 1 | -2/+6 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'mg/mailmap-update' into maint | Junio C Hamano | 2010-04-09 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/maint-daemon-sans-ss-family' into maint | Junio C Hamano | 2010-04-09 | 1 | -4/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | fetch/push: fix usage strings | Tay Ray Chuan | 2010-04-09 | 4 | -10/+10 |
* | | | | | | | | | | | | | Merge branch 'rc/maint-reflog-msg-for-forced-branch' | Junio C Hamano | 2010-04-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | branch: say "Reset to" in reflog entries for 'git branch -f' operations | Tay Ray Chuan | 2010-04-09 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Merge early parts of jk/cached-textconv | Junio C Hamano | 2010-04-08 | 3 | -4/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | diff.c: work around pointer constness warnings | Junio C Hamano | 2010-04-08 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | fix textconv leak in emit_rewrite_diff | Jeff King | 2010-04-01 | 1 | -0/+4 |
| * | | | | | | | | | | | | | | fix const-correctness of write_sha1_file | Jeff King | 2010-04-01 | 2 | -4/+4 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-04-08 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | docs: clarify "branch -l" | Jeff King | 2010-04-08 | 1 | -0/+2 |
* | | | | | | | | | | | | | | Merge branch 'mg/notes-reflog' | Junio C Hamano | 2010-04-07 | 2 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | refs.c: Write reflogs for notes just like for branch heads | Michael J Gruber | 2010-03-29 | 2 | -1/+2 |
| * | | | | | | | | | | | | | | t3301-notes: Test the creation of reflog entries | Michael J Gruber | 2010-03-29 | 1 | -0/+9 |
* | | | | | | | | | | | | | | | Merge branch 'jn/mailinfo-scissors' | Junio C Hamano | 2010-04-07 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Teach mailinfo %< as an alternative scissors mark | Jonathan Nieder | 2010-04-04 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | fix typos and grammar in 1.7.1 draft release notes | Jeff King | 2010-04-07 | 1 | -10/+10 |
* | | | | | | | | | | | | | | | | notes.h: declare bit field as unsigned to silence compiler complaints | Brandon Casey | 2010-04-06 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Git 1.7.1-rc0v1.7.1-rc0 | Junio C Hamano | 2010-04-06 | 1 | -1/+15 |
* | | | | | | | | | | | | | | | | Merge branch 'da/maint-python-startup' | Junio C Hamano | 2010-04-06 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Makefile: Remove usage of deprecated Python "has_key" method | David Aguilar | 2010-03-28 | 1 | -3/+2 |
* | | | | | | | | | | | | | | | | | Merge branch 'ic/bash-completion-rpm' | Junio C Hamano | 2010-04-06 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | RPM spec: include bash completion support | Ian Ward Comfort | 2010-03-29 | 1 | -0/+7 |
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'sb/fmt-merge-msg' | Junio C Hamano | 2010-04-06 | 5 | -142/+235 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | fmt-merge-msg: hide summary option | Stephen Boyd | 2010-03-24 | 1 | -1/+3 |
| * | | | | | | | | | | | | | | | | | fmt-merge-msg: remove custom string_list implementation | Stephen Boyd | 2010-03-24 | 1 | -83/+44 |
| * | | | | | | | | | | | | | | | | | string-list: add unsorted_string_list_lookup() | Stephen Boyd | 2010-03-24 | 3 | -5/+17 |
| * | | | | | | | | | | | | | | | | | fmt-merge-msg: use pretty.c routines | Stephen Boyd | 2010-03-24 | 1 | -21/+8 |
| * | | | | | | | | | | | | | | | | | t6200: test fmt-merge-msg more | Stephen Boyd | 2010-03-24 | 1 | -0/+115 |
| * | | | | | | | | | | | | | | | | | t6200: modernize with test_tick | Stephen Boyd | 2010-03-24 | 1 | -35/+29 |