Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Git 1.8.1.5v1.8.1.5 | Junio C Hamano | 2013-03-01 | 3 | -2/+9 |
* | Make !pattern in .gitattributes non-fatal | Thomas Rast | 2013-03-01 | 2 | -4/+7 |
* | Merge branch 'wk/user-manual' into maint | Junio C Hamano | 2013-03-01 | 1 | -56/+77 |
|\ | |||||
| * | user-manual: Flesh out uncommitted changes and submodule updates | W. Trevor King | 2013-02-19 | 1 | -1/+3 |
| * | user-manual: Use request-pull to generate "please pull" text | W. Trevor King | 2013-02-19 | 1 | -9/+5 |
| * | user-manual: Reorganize the reroll sections, adding 'git rebase -i' | W. Trevor King | 2013-02-19 | 1 | -46/+69 |
* | | Documentation/githooks: Fix linkgit | Andrew Wong | 2013-03-01 | 1 | -1/+1 |
* | | Update draft release notes to 1.8.1.5 | Junio C Hamano | 2013-02-27 | 1 | -1/+5 |
* | | Merge branch 'ef/non-ascii-parse-options-error-diag' into maint | Junio C Hamano | 2013-02-27 | 1 | -1/+4 |
|\ \ | |||||
| * | | parse-options: report uncorrupted multi-byte options | Erik Faye-Lund | 2013-02-12 | 1 | -1/+4 |
* | | | Merge branch 'wk/man-deny-current-branch-is-default-these-days' into maint | Junio C Hamano | 2013-02-27 | 1 | -3/+4 |
|\ \ \ | |||||
| * | | | user-manual: typofix (ofthe->of the) | Junio C Hamano | 2013-02-18 | 1 | -1/+1 |
| * | | | user-manual: Update for receive.denyCurrentBranch=refuse | W. Trevor King | 2013-02-14 | 1 | -3/+4 |
* | | | | Merge branch 'jn/less-reconfigure' into maint | Junio C Hamano | 2013-02-27 | 1 | -6/+8 |
|\ \ \ \ | |||||
| * | | | | Makefile: avoid infinite loop on configure.ac change | Jeff King | 2013-02-21 | 1 | -6/+8 |
* | | | | | Documentation/submodule: Add --force to update synopsis | Brad King | 2013-02-27 | 1 | -1/+1 |
* | | | | | Prepare for 1.8.1.5 | Junio C Hamano | 2013-02-25 | 2 | -1/+38 |
* | | | | | Merge branch 'jc/mention-tracking-for-pull-default' into maint | Junio C Hamano | 2013-02-25 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | doc: mention tracking for pull.default | Junio C Hamano | 2013-02-01 | 1 | -1/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'mm/config-intro-in-git-doc' into maint | Junio C Hamano | 2013-02-25 | 1 | -6/+5 |
|\ \ \ \ \ | |||||
| * | | | | | git.txt: update description of the configuration mechanism | Matthieu Moy | 2013-02-15 | 1 | -6/+5 |
* | | | | | | Merge branch 'da/p4merge-mktemp-fix' into maint | Junio C Hamano | 2013-02-25 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | p4merge: fix printf usage | David Aguilar | 2013-02-10 | 1 | -1/+1 |
* | | | | | | | Merge branch 'bw/get-tz-offset-perl' into maint | Junio C Hamano | 2013-02-25 | 4 | -13/+35 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | cvsimport: format commit timestamp ourselves without using strftime | Ben Walton | 2013-02-09 | 1 | -1/+4 |
| * | | | | | | | perl/Git.pm: fix get_tz_offset to properly handle DST boundary cases | Ben Walton | 2013-02-09 | 1 | -3/+3 |
| * | | | | | | | Move Git::SVN::get_tz to Git::get_tz_offset | Ben Walton | 2013-02-09 | 3 | -12/+31 |
* | | | | | | | | Merge branch 'al/mergetool-printf-fix' into maint | Junio C Hamano | 2013-02-25 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | difftool--helper: fix printf usage | David Aguilar | 2013-02-10 | 1 | -1/+1 |
| * | | | | | | | | git-mergetool: print filename when it contains % | Asheesh Laroia | 2013-02-08 | 1 | -1/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jx/utf8-printf-width' into maint | Junio C Hamano | 2013-02-25 | 3 | -2/+25 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add utf8_fprintf helper that returns correct number of columns | Jiang Xin | 2013-02-11 | 3 | -2/+25 |
* | | | | | | | | | Merge branch 'mg/bisect-doc' into maint | Junio C Hamano | 2013-02-25 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-bisect.txt: clarify that reset quits bisect | Michael J Gruber | 2013-02-11 | 1 | -1/+6 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'sp/smart-http-content-type-check' into maint | Junio C Hamano | 2013-02-25 | 8 | -17/+59 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | http_request: reset "type" strbuf before adding | Jeff King | 2013-02-06 | 1 | -0/+1 |
| * | | | | | | | | | t5551: fix expected error output | Junio C Hamano | 2013-02-05 | 1 | -2/+1 |
| * | | | | | | | | | Verify Content-Type from smart HTTP servers | Shawn Pearce | 2013-02-04 | 8 | -17/+59 |
* | | | | | | | | | | Merge branch 'jc/combine-diff-many-parents' into maint | Junio C Hamano | 2013-02-25 | 2 | -14/+31 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t4038: add tests for "diff --cc --raw <trees>" | John Keeping | 2013-02-05 | 1 | -0/+24 |
| * | | | | | | | | | | combine-diff: lift 32-way limit of combined diff | Junio C Hamano | 2013-02-03 | 1 | -14/+7 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jk/apply-similaritly-parsing' into maint | Junio C Hamano | 2013-02-25 | 1 | -4/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | builtin/apply: tighten (dis)similarity index parsing | John Keeping | 2013-02-03 | 1 | -4/+6 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'jk/remote-helpers-doc' into maint | Junio C Hamano | 2013-02-25 | 5 | -7/+23 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Rename {git- => git}remote-helpers.txt | John Keeping | 2013-02-01 | 5 | -7/+23 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'ab/gitweb-use-same-scheme' into maint | Junio C Hamano | 2013-02-25 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | gitweb: refer to picon/gravatar images over the same scheme | Andrej E Baranov | 2013-01-29 | 1 | -2/+2 |
* | | | | | | | | | | | Merge branch 'zk/clean-report-failure' into maint | Junio C Hamano | 2013-02-25 | 1 | -29/+125 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-clean: Display more accurate delete messages | Zoltan Klinger | 2013-01-14 | 1 | -29/+125 |
* | | | | | | | | | | | | Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maint | Junio C Hamano | 2013-02-25 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ |