Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jm/maint-diff-words-with-sbe' into maint | Junio C Hamano | 2011-05-26 | 2 | -2/+36 |
|\ | |||||
| * | do not read beyond end of malloc'd buffer | Jim Meyering | 2011-05-20 | 2 | -2/+36 |
* | | Merge branch 'kk/maint-prefix-in-config-mak' into maint | Junio C Hamano | 2011-05-26 | 1 | -9/+9 |
|\ \ | |||||
| * | | Honor $(prefix) set in config.mak* when defining ETC_GIT* | Johannes Sixt | 2011-05-09 | 1 | -9/+9 |
| * | | Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconf... | Junio C Hamano | 2011-05-09 | 1 | -10/+9 |
| * | | Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir | Kacper Kornet | 2011-04-28 | 1 | -9/+10 |
* | | | Merge branch 'mg/diff-uiconfig-doc' into maint | Junio C Hamano | 2011-05-26 | 2 | -12/+30 |
|\ \ \ | |||||
| * | | | config.txt,diff-options.txt: porcelain vs. plumbing for color.diff | Michael J Gruber | 2011-04-27 | 2 | -12/+30 |
* | | | | Merge branch 'ft/gitweb-tar-with-gzip-n' into maint | Junio C Hamano | 2011-05-26 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | gitweb: supply '-n' to gzip for identical output | Fraser Tweedale | 2011-04-26 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'ss/doc-svn' into maint | Junio C Hamano | 2011-05-26 | 1 | -9/+7 |
|\ \ \ \ | |||||
| * | | | | remove noise and inaccuracies from git-svn docs | Stefan Sperling | 2011-04-19 | 1 | -9/+7 |
* | | | | | Merge branch 'jn/format-patch-doc' into maint | Junio C Hamano | 2011-05-26 | 4 | -195/+229 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird | Johannes Sixt | 2011-04-19 | 1 | -4/+14 |
| * | | | | | Documentation: publicize hints for sending patches with GMail | Jonathan Nieder | 2011-04-15 | 4 | -55/+61 |
| * | | | | | Documentation: publicize KMail hints for sending patches inline | Jonathan Nieder | 2011-04-15 | 2 | -20/+18 |
| * | | | | | Documentation: hints for sending patches inline with Thunderbird | Jonathan Nieder | 2011-04-15 | 2 | -80/+84 |
| * | | | | | Documentation: explain how to check for patch corruption | Jonathan Nieder | 2011-04-15 | 2 | -44/+60 |
| * | | | | | Merge v1.7.5-rc2 into jn/format-patch-doc | Junio C Hamano | 2011-04-15 | 431 | -4909/+12524 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'jc/maint-pathspec-stdin-and-cmdline' into maint | Junio C Hamano | 2011-05-26 | 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 branch 'jk/cherry-pick-root-with-resolve' into maint | Junio C Hamano | 2011-05-26 | 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 'rg/copy-gecos-username' into maint | Junio C Hamano | 2011-05-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | copy_gecos: fix not adding nlen to len when processing "&" | Rafael Gieschke | 2011-05-17 | 1 | -0/+1 |
* | | | | | | | | | | | | Merge branch 'fc/completion-zsh' into maint | Junio C Hamano | 2011-05-26 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git-completion: fix regression in zsh support | Felipe Contreras | 2011-05-10 | 1 | -0/+8 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jk/git-connection-deadlock-fix' into maint | Junio C Hamano | 2011-05-26 | 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' into maint | Junio C Hamano | 2011-05-26 | 1 | -2/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | 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 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma... | Junio C Hamano | 2011-05-05 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | send-pack: unbreak push over stateless rpc | Jeff King | 2011-05-05 | 1 | -1/+2 |
| * | | | | | | | | | | | | | Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma... | Junio C Hamano | 2011-04-25 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | send-pack: avoid deadlock when pack-object dies early | Johannes Sixt | 2011-04-25 | 1 | -0/+4 |
* | | | | | | | | | | | | | | Merge branch 'svn-fe-maint' of git://repo.or.cz/git/jrn into maint | Junio C Hamano | 2011-05-26 | 1 | -104/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Revert "t0081 (line-buffer): add buffering tests" | Jonathan Nieder | 2011-03-30 | 1 | -104/+2 |
* | | | | | | | | | | | | | | | init/clone: remove short option -L and document --separate-git-dir | Nguyen Thai Ngoc Duy | 2011-05-25 | 6 | -8/+6 |
* | | | | | | | | | | | | | | | git-svn: Fix git svn log --show-commit | Michael J Gruber | 2011-05-20 | 2 | -1/+16 |
* | | | | | | | | | | | | | | | 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 |
* | | | | | | | | | | | | | | | Update draft release notes to 1.7.5.2 | Junio C Hamano | 2011-05-16 | 1 | -0/+15 |