summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ld/p4-preserve-user-names'Junio C Hamano2011-05-193-38/+340
|\
| * git-p4: warn if git authorship won't be retainedLuke Diamand2011-05-133-2/+79
| * git-p4: small improvements to user-preservationLuke Diamand2011-05-091-5/+14
| * git-p4: add option to preserve user namesLuke Diamand2011-04-263-38/+254
* | Merge branch 'ms/tagname-does-not-begin-with-dash'Junio C Hamano2011-05-191-8/+18
|\ \
| * | tag: disallow '-' as tag nameMichael Schubert2011-05-101-8/+18
| |/
* | Merge branch 'jk/git-connection-deadlock-fix'Junio C Hamano2011-05-194-14/+67
|\ \
| * | test core.gitproxy configurationJeff King2011-05-181-0/+43
| * | send-pack: avoid deadlock on git:// push with failed pack-objectsJeff King2011-05-161-0/+2
| * | connect: let callers know if connection is a socketJeff King2011-05-162-1/+7
| * | connect: treat generic proxy processes like ssh processesJeff King2011-05-161-13/+15
* | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'Junio C Hamano2011-05-191-2/+2
|\ \ \
| * \ \ Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Junio C Hamano2011-05-161-2/+2
| |\ \ \ | | |/ /
| | * | sideband_demux(): fix decl-after-stmtJunio C Hamano2011-05-161-2/+2
* | | | Merge branch 'jk/cherry-pick-root-with-resolve'Junio C Hamano2011-05-193-7/+36
|\ \ \ \
| * | | | t3503: test cherry picking and reverting root commitsJeff King2011-05-161-2/+25
| * | | | revert: allow reverting a root commitJeff King2011-05-161-3/+1
| * | | | cherry-pick: handle root commits with external strategiesJeff King2011-05-161-2/+10
* | | | | Merge branch 'jc/maint-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-192-52/+45
|\ \ \ \ \
| * \ \ \ \ Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-112-52/+45
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-112-52/+45
| | |\ \ \ \ \
| | | * | | | | setup_revisions(): take pathspec from command line and --stdin correctlyJunio C Hamano2011-05-112-52/+45
* | | | | | | | Merge 1.7.5.2 inJunio C Hamano2011-05-192-1/+513
|\ \ \ \ \ \ \ \
| * | | | | | | | Git 1.7.5.2v1.7.5.2Junio C Hamano2011-05-192-2/+3
| * | | | | | | | provide a copy of the LGPLv2.1Jonathan Nieder2011-05-191-0/+511
* | | | | | | | | Revert "Merge branch 'en/merge-recursive'"Junio C Hamano2011-05-192-81/+6
* | | | | | | | | Makefile: sort TEST_PROGRAMS listJeff King2011-05-191-2/+2
* | | | | | | | | Update release notes to 1.7.6Junio C Hamano2011-05-161-13/+20
* | | | | | | | | Merge branch 'jc/convert'Junio C Hamano2011-05-164-90/+84
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | convert: make it harder to screw up adding a conversion attributeJunio C Hamano2011-05-091-41/+38
| * | | | | | | | | convert: make it safer to add conversion attributesJunio C Hamano2011-05-091-26/+22
| * | | | | | | | | convert: give saner names to crlf/eol variables, types and functionsJunio C Hamano2011-05-091-30/+31
| * | | | | | | | | convert: rename the "eol" global variable to "core_eol"Junio C Hamano2011-05-094-10/+10
* | | | | | | | | | Merge branch 'ci/commit--interactive-atomic'Junio C Hamano2011-05-166-31/+75
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Test atomic git-commit --interactiveConrad Irwin2011-05-101-0/+10
| * | | | | | | | | | Add commit to list of config.singlekey commandsConrad Irwin2011-05-091-3/+4
| * | | | | | | | | | Add support for -p/--patch to git-commitConrad Irwin2011-05-094-16/+27
| * | | | | | | | | | Allow git commit --interactive with pathsConrad Irwin2011-05-092-4/+3
| * | | | | | | | | | t7501.8: feed a meaningful commandJeff King2011-05-091-4/+6
| * | | | | | | | | | Use a temporary index for git commit --interactiveConrad Irwin2011-05-082-9/+30
* | | | | | | | | | | Merge branch 'sg/completion-updates'Junio C Hamano2011-05-161-4/+16
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'fc/completion-zsh' into sg/completion-updatesJunio C Hamano2011-05-101-0/+8
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | git-completion: fix regression in zsh supportFelipe Contreras2011-05-101-0/+8
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Revert "completion: don't declare 'local words' to make zsh happy"Junio C Hamano2011-05-101-6/+2
| * | | | | | | | | | | completion: move private shopt shim for zsh to __git_ namespaceJonathan Nieder2011-05-081-4/+8
| * | | | | | | | | | | completion: don't declare 'local words' to make zsh happySZEDER Gábor2011-04-281-2/+6
* | | | | | | | | | | | Merge branch 'kk/maint-prefix-in-config-mak'Junio C Hamano2011-05-161-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Honor $(prefix) set in config.mak* when defining ETC_GIT*Johannes Sixt2011-05-091-9/+9
| * | | | | | | | | | | | Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconf...Junio C Hamano2011-05-091-10/+9
| * | | | | | | | | | | | Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdirKacper Kornet2011-04-281-9/+10