Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rebase: give a better error message for bogus branch | Jeff King | 2011-01-26 | 1 | -0/+1 |
* | rebase: use explicit "--" with checkout | Jeff King | 2011-01-26 | 2 | -2/+2 |
* | exec_cmd: remove unused extern | Erik Faye-Lund | 2011-01-19 | 1 | -1/+0 |
* | Merge branch 'jn/gitweb-no-logo' into maint | Junio C Hamano | 2011-01-19 | 1 | -4/+9 |
|\ | |||||
| * | gitweb: make logo optional | Jonathan Nieder | 2011-01-04 | 1 | -4/+9 |
* | | Merge branch 'jk/diff-driver-binary-doc' into maint | Junio C Hamano | 2011-01-19 | 1 | -0/+33 |
|\ \ | |||||
| * | | docs: explain diff.*.binary option | Jeff King | 2011-01-10 | 1 | -0/+33 |
* | | | Merge branch 'tr/submodule-relative-scp-url' into maint | Junio C Hamano | 2011-01-19 | 2 | -2/+52 |
|\ \ \ | |||||
| * | | | submodule: fix relative url parsing for scp-style origin | Thomas Rast | 2011-01-10 | 2 | -2/+52 |
| |/ / | |||||
* | | | Merge branch 'rj/maint-difftool-cygwin-workaround' into maint | Junio C Hamano | 2011-01-19 | 1 | -4/+8 |
|\ \ \ | |||||
| * | | | difftool: Fix failure on Cygwin | Ramsay Jones | 2010-12-14 | 1 | -4/+8 |
* | | | | Merge branch 'rj/maint-test-fixes' into maint | Junio C Hamano | 2011-01-19 | 4 | -23/+35 |
|\ \ \ \ | |||||
| * | | | | t9501-*.sh: Fix a test failure on Cygwin | Ramsay Jones | 2010-12-14 | 1 | -1/+1 |
| * | | | | lib-git-svn.sh: Add check for mis-configured web server variables | Ramsay Jones | 2010-12-14 | 1 | -0/+10 |
| * | | | | lib-git-svn.sh: Avoid setting web server variables unnecessarily | Ramsay Jones | 2010-12-14 | 1 | -22/+25 |
| * | | | | t9142: Move call to start_httpd into the setup test | Ramsay Jones | 2010-12-14 | 1 | -3/+2 |
| * | | | | t3600-rm.sh: Don't pass a non-existent prereq to test #15 | Ramsay Jones | 2010-12-14 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'jn/maint-gitweb-pathinfo-fix' into maint | Junio C Hamano | 2011-01-19 | 1 | -8/+23 |
|\ \ \ \ | |||||
| * | | | | gitweb: Fix handling of whitespace in generated links | Jakub Narebski | 2010-12-14 | 1 | -8/+23 |
| |/ / / | |||||
* | | | | Merge branch 'ak/describe-exact' into maint | Junio C Hamano | 2011-01-19 | 1 | -25/+60 |
|\ \ \ \ | |||||
| * | | | | describe: Delay looking up commits until searching for an inexact match | Anders Kaseorg | 2010-12-09 | 1 | -15/+22 |
| * | | | | describe: Store commit_names in a hash table by commit SHA1 | Anders Kaseorg | 2010-12-09 | 1 | -5/+33 |
| * | | | | describe: Do not use a flex array in struct commit_name | Anders Kaseorg | 2010-12-09 | 1 | -6/+6 |
| * | | | | describe: Use for_each_rawref | Anders Kaseorg | 2010-12-09 | 1 | -1/+1 |
* | | | | | Merge branch 'jn/maint-fast-import-object-reuse' into maint | Junio C Hamano | 2011-01-19 | 1 | -7/+2 |
|\ \ \ \ \ | |||||
| * | | | | | fast-import: insert new object entries at start of hash bucket | David Barr | 2010-11-24 | 1 | -7/+2 |
* | | | | | | Merge branch 'jn/submodule-b-current' into maint | Junio C Hamano | 2011-01-19 | 2 | -20/+24 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git submodule: Remove now obsolete tests before cloning a repo | Jens Lehmann | 2010-12-06 | 2 | -19/+23 |
| * | | | | | | git submodule -b ... of current HEAD fails | Jonathan Nieder | 2010-12-06 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jc/maint-svn-info-test-fix' into maint | Junio C Hamano | 2011-01-19 | 1 | -72/+34 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t9119: do not compare "Text Last Updated" line from "svn info" | Junio C Hamano | 2010-12-06 | 1 | -72/+34 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'nd/maint-relative' into maint | Junio C Hamano | 2011-01-19 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | get_cwd_relative(): do not misinterpret root path | Nguyễn Thái Ngọc Duy | 2010-11-23 | 1 | -0/+6 |
* | | | | | | | | commit: suggest --amend --reset-author to fix commiter identity | Matthieu Moy | 2011-01-12 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'maint-1.7.2' into maint | Junio C Hamano | 2011-01-10 | 2 | -5/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'maint-1.7.1' into maint-1.7.2 | Junio C Hamano | 2011-01-10 | 2 | -5/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'maint-1.7.0' into maint-1.7.1 | Junio C Hamano | 2011-01-10 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Documentation/git-archive: spell --worktree-attributes correctly | Thomas Rast | 2011-01-10 | 1 | -1/+1 |
| | | | |_|_|_|_|/ / | | | |/| | | | | | | |||||
| | * | | | | | | | | Documentation/githooks: post-rewrite-copy-notes never existed | Thomas Rast | 2011-01-10 | 1 | -4/+0 |
* | | | | | | | | | | Mark gitk script executable | Anders Kaseorg | 2011-01-08 | 1 | -0/+0 |
* | | | | | | | | | | Git 1.7.3.5v1.7.3.5 | Junio C Hamano | 2011-01-05 | 2 | -1/+3 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
* | | | | | | | | | gitweb: skip logo in atom feed when there is none | Jonathan Nieder | 2011-01-04 | 1 | -1/+1 |
* | | | | | | | | | t9001: Fix test prerequisites | Robin H. Johnson | 2010-12-29 | 1 | -2/+2 |
* | | | | | | | | | Prepare for 1.7.3.5 | Junio C Hamano | 2010-12-28 | 2 | -1/+33 |
* | | | | | | | | | Merge branch 'jk/commit-die-on-bogus-ident' into maint | Junio C Hamano | 2010-12-28 | 3 | -24/+40 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | commit: die before asking to edit the log message | Junio C Hamano | 2010-12-20 | 1 | -22/+32 |
| * | | | | | | | | | ident: die on bogus date format | Jeff King | 2010-12-20 | 2 | -2/+8 |
* | | | | | | | | | | Merge branch 'ks/blame-worktree-textconv-cached' into maint | Junio C Hamano | 2010-12-28 | 2 | -2/+23 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fill_textconv(): Don't get/put cache if sha1 is not valid | Kirill Smelkov | 2010-12-19 | 2 | -4/+3 |
| * | | | | | | | | | | t/t8006: Demonstrate blame is broken when cachetextconv is on | Kirill Smelkov | 2010-12-19 | 1 | -0/+22 |
| |/ / / / / / / / / |