Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | refactor get_textconv to not require diff_filespec | Jeff King | 2011-05-23 | 3 | -13/+20 |
* | combine-diff: handle binary files as binary | Jeff King | 2011-05-23 | 2 | -2/+148 |
* | combine-diff: calculate mode_differs earlier | Jeff King | 2011-05-23 | 1 | -2/+7 |
* | combine-diff: split header printing into its own function | Jeff King | 2011-05-23 | 1 | -61/+74 |
* | Merge branch 'maint' | Junio C Hamano | 2011-05-20 | 2 | -1/+16 |
|\ | |||||
| * | git-svn: Fix git svn log --show-commit | Michael J Gruber | 2011-05-20 | 2 | -1/+16 |
* | | Update draft release notes to 1.7.6 | Junio C Hamano | 2011-05-19 | 1 | -1/+22 |
* | | Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline' | Junio C Hamano | 2011-05-19 | 0 | -0/+0 |
|\ \ | |||||
| * \ | Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' | Junio C Hamano | 2011-05-11 | 2 | -52/+44 |
| |\ \ | |||||
* | \ \ | Merge branch 'rg/copy-gecos-username' | Junio C Hamano | 2011-05-19 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | copy_gecos: fix not adding nlen to len when processing "&" | Rafael Gieschke | 2011-05-17 | 1 | -0/+1 |
* | | | | | Merge branch 'jl/submodule-conflicted-gitmodules' | Junio C Hamano | 2011-05-19 | 2 | -6/+117 |
|\ \ \ \ \ | |||||
| * | | | | | Submodules: Don't parse .gitmodules when it contains, merge conflicts | Jens Lehmann | 2011-05-14 | 2 | -5/+32 |
| * | | | | | test that git status works with merge conflict in, .gitmodules | Heiko Voigt | 2011-05-14 | 1 | -4/+88 |
* | | | | | | Merge branch 'jc/replacing' | Junio C Hamano | 2011-05-19 | 8 | -23/+45 |
|\ \ \ \ \ \ | |||||
| * | | | | | | read_sha1_file(): allow selective bypassing of replacement mechanism | Junio C Hamano | 2011-05-15 | 2 | -5/+12 |
| * | | | | | | inline lookup_replace_object() calls | Junio C Hamano | 2011-05-15 | 3 | -4/+14 |
| * | | | | | | read_sha1_file(): get rid of read_sha1_file_repl() madness | Junio C Hamano | 2011-05-15 | 4 | -17/+9 |
| * | | | | | | t6050: make sure we test not just commit replacement | Junio C Hamano | 2011-05-15 | 1 | -2/+16 |
| * | | | | | | Declare lookup_replace_object() in cache.h, not in commit.h | Junio C Hamano | 2011-05-15 | 2 | -2/+1 |
* | | | | | | | Merge branch 'nd/sparse-co-fix' | Junio C Hamano | 2011-05-19 | 2 | -33/+83 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | sparse checkout: do not eagerly decide the fate for whole directory | Nguyễn Thái Ngọc Duy | 2011-05-10 | 2 | -29/+75 |
| * | | | | | | | t1011: fix sparse-checkout initialization and add new file | Nguyễn Thái Ngọc Duy | 2011-05-10 | 1 | -4/+8 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'ld/p4-preserve-user-names' | Junio C Hamano | 2011-05-19 | 3 | -38/+340 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-p4: warn if git authorship won't be retained | Luke Diamand | 2011-05-13 | 3 | -2/+79 |
| * | | | | | | | git-p4: small improvements to user-preservation | Luke Diamand | 2011-05-09 | 1 | -5/+14 |
| * | | | | | | | git-p4: add option to preserve user names | Luke Diamand | 2011-04-26 | 3 | -38/+254 |
* | | | | | | | | Merge branch 'ms/tagname-does-not-begin-with-dash' | Junio C Hamano | 2011-05-19 | 1 | -8/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | tag: disallow '-' as tag name | Michael Schubert | 2011-05-10 | 1 | -8/+18 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jk/git-connection-deadlock-fix' | Junio C Hamano | 2011-05-19 | 4 | -14/+67 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | test core.gitproxy configuration | Jeff King | 2011-05-18 | 1 | -0/+43 |
| * | | | | | | | | send-pack: avoid deadlock on git:// push with failed pack-objects | Jeff King | 2011-05-16 | 1 | -0/+2 |
| * | | | | | | | | connect: let callers know if connection is a socket | Jeff King | 2011-05-16 | 2 | -1/+7 |
| * | | | | | | | | connect: treat generic proxy processes like ssh processes | Jeff King | 2011-05-16 | 1 | -13/+15 |
* | | | | | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' | Junio C Hamano | 2011-05-19 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma... | Junio C Hamano | 2011-05-16 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | sideband_demux(): fix decl-after-stmt | Junio C Hamano | 2011-05-16 | 1 | -2/+2 |
* | | | | | | | | | | Merge branch 'jk/cherry-pick-root-with-resolve' | Junio C Hamano | 2011-05-19 | 3 | -7/+36 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t3503: test cherry picking and reverting root commits | Jeff King | 2011-05-16 | 1 | -2/+25 |
| * | | | | | | | | | | revert: allow reverting a root commit | Jeff King | 2011-05-16 | 1 | -3/+1 |
| * | | | | | | | | | | cherry-pick: handle root commits with external strategies | Jeff King | 2011-05-16 | 1 | -2/+10 |
* | | | | | | | | | | | Merge branch 'jc/maint-pathspec-stdin-and-cmdline' | Junio C Hamano | 2011-05-19 | 2 | -52/+45 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline' | Junio C Hamano | 2011-05-11 | 2 | -52/+45 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' | Junio C Hamano | 2011-05-11 | 2 | -52/+45 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | / / | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | setup_revisions(): take pathspec from command line and --stdin correctly | Junio C Hamano | 2011-05-11 | 2 | -52/+45 |
* | | | | | | | | | | | | Merge 1.7.5.2 in | Junio C Hamano | 2011-05-19 | 2 | -1/+513 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Git 1.7.5.2v1.7.5.2 | Junio C Hamano | 2011-05-19 | 2 | -2/+3 |
| * | | | | | | | | | | | provide a copy of the LGPLv2.1 | Jonathan Nieder | 2011-05-19 | 1 | -0/+511 |
* | | | | | | | | | | | | Revert "Merge branch 'en/merge-recursive'" | Junio C Hamano | 2011-05-19 | 2 | -81/+6 |
* | | | | | | | | | | | | Makefile: sort TEST_PROGRAMS list | Jeff King | 2011-05-19 | 1 | -2/+2 |