Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2012-02-26 | 1 | -33/+64 |
|\ | |||||
| * | git-p4: fix submit regression with clientSpec and subdir clone | Pete Wyckoff | 2012-02-26 | 1 | -32/+54 |
| * | git-p4: set useClientSpec variable on initial clone | Pete Wyckoff | 2012-02-26 | 1 | -1/+10 |
* | | Merge branch 'ld/git-p4-expanded-keywords' | Junio C Hamano | 2012-02-23 | 1 | -10/+108 |
|\ \ | |||||
| * | | git-p4: add initial support for RCS keywordsld/git-p4-expanded-keywords | Luke Diamand | 2012-02-23 | 1 | -10/+108 |
* | | | Sync with 1.7.9.2 | Junio C Hamano | 2012-02-22 | 1 | -16/+4 |
|\ \ \ | | |/ | |/| | |||||
| * | | completion: use tabs for indentation | Philip Jägenstedt | 2012-02-22 | 1 | -4/+4 |
| * | | completion: remove stale "to submit patches" documentation | Philip Jägenstedt | 2012-02-22 | 1 | -12/+0 |
* | | | git-p4: the option to specify 'host' is -H, not -h | Russell Myers | 2012-02-22 | 1 | -1/+1 |
* | | | Merge branch 'master' of git://bogomips.org/git-svn | Junio C Hamano | 2012-02-21 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | completion: add --interactive option to git svn dcommit | Frederic Heitzmann | 2012-02-21 | 1 | -1/+1 |
* | | | | Merge branch 'jk/diff-highlight' | Junio C Hamano | 2012-02-21 | 2 | -37/+181 |
|\ \ \ \ | |||||
| * | | | | diff-highlight: document some non-optimal casesjk/diff-highlight | Jeff King | 2012-02-13 | 1 | -0/+93 |
| * | | | | diff-highlight: match multi-line hunks | Jeff King | 2012-02-13 | 2 | -34/+52 |
| * | | | | diff-highlight: refactor to prepare for multi-line hunks | Jeff King | 2012-02-13 | 1 | -8/+14 |
| * | | | | diff-highlight: don't highlight whole lines | Jeff King | 2012-02-13 | 1 | -2/+26 |
| * | | | | diff-highlight: make perl strict and warnings fatal | Jeff King | 2012-02-13 | 1 | -0/+3 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2012-02-21 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | |||||
| * | | | Merge branch 'fc/zsh-completion' into maint | Junio C Hamano | 2012-02-21 | 1 | -56/+11 |
| |\ \ \ | |||||
| * | | | | completion: Allow dash as the first character for __git_ps1 | Christian Hammerl | 2012-02-21 | 1 | -1/+1 |
* | | | | | Sync with maint | Junio C Hamano | 2012-02-16 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | |||||
| * | | | completion: --list option for git-branch | Ralf Thielow | 2012-02-16 | 1 | -1/+1 |
| * | | | Merge branch 'rt/completion-branch-edit-desc' into maint | Junio C Hamano | 2012-02-16 | 1 | -1/+1 |
| |\ \ \ | |||||
| * | | | | completion: --edit and --no-edit for git-merge | Adrian Weimann | 2012-02-06 | 1 | -1/+1 |
* | | | | | Merge branch 'fc/zsh-completion' | Junio C Hamano | 2012-02-12 | 1 | -56/+11 |
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | | | |||||
| * | | | completion: simplify __gitcomp and __gitcomp_nl implementationsfc/zsh-completion | Felipe Contreras | 2012-02-06 | 1 | -16/+3 |
| * | | | completion: use ls -1 instead of rolling a loop to do that ourselves | Felipe Contreras | 2012-02-06 | 1 | -37/+2 |
| * | | | completion: work around zsh option propagation bug | Felipe Contreras | 2012-02-06 | 1 | -3/+6 |
| |/ / | |||||
* | | | Merge branch 'jn/svn-fe' | Junio C Hamano | 2012-02-07 | 1 | -4/+4 |
|\ \ \ | |||||
| * \ \ | Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-fe | Junio C Hamano | 2012-01-27 | 1 | -4/+4 |
| |\ \ \ | |||||
| | * | | | vcs-svn: implement text-delta handling | David Barr | 2011-05-26 | 1 | -4/+1 |
| | * | | | Merge branch 'db/vcs-svn-incremental' into svn-fe | Jonathan Nieder | 2011-05-26 | 1 | -1/+5 |
| | |\ \ \ | |||||
| | | * | | | vcs-svn: set up channel to read fast-import cat-blob response | David Barr | 2011-03-07 | 1 | -1/+5 |
* | | | | | | Merge branch 'rt/completion-branch-edit-desc' | Junio C Hamano | 2012-02-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | completion: --edit-description option for git-branchrt/completion-branch-edit-desc | Ralf Thielow | 2012-01-29 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'va/git-p4-branch' | Junio C Hamano | 2012-01-31 | 1 | -2/+46 |
|\ \ \ \ \ | |||||
| * | | | | | git-p4: Change p4 command invocation | Pete Wyckoff | 2012-01-26 | 1 | -1/+1 |
| * | | | | | git-p4: Search for parent commit on branch creation | Vitor Antunes | 2012-01-26 | 1 | -1/+45 |
* | | | | | | Merge branch 'ld/git-p4-branches-and-labels' | Junio C Hamano | 2012-01-31 | 1 | -35/+44 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | git-p4: importing labels should cope with missing owner | Luke Diamand | 2012-01-20 | 1 | -28/+35 |
| * | | | | | git-p4: cope with labels with empty descriptions | Luke Diamand | 2012-01-20 | 1 | -3/+5 |
| * | | | | | git-p4: handle p4 branches and labels containing shell chars | Luke Diamand | 2012-01-20 | 1 | -4/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | completion: --edit and --no-edit for git-merge | Adrian Weimann | 2012-01-30 | 1 | -1/+1 |
* | | | | | Merge branch 'pw/p4-view-updates' | Junio C Hamano | 2012-01-29 | 1 | -4/+5 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | git-p4: clarify comment | Pete Wyckoff | 2012-01-11 | 1 | -1/+2 |
| * | | | | git-p4: fix verbose comment typo | Pete Wyckoff | 2012-01-11 | 1 | -1/+1 |
| * | | | | git-p4: only a single ... wildcard is supported | Pete Wyckoff | 2012-01-11 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | git-completion: workaround zsh COMPREPLY bug | Felipe Contreras | 2012-01-26 | 1 | -0/+8 |
|/ / / | |||||
* | | | git-p4: rewrite view handling | Pete Wyckoff | 2012-01-03 | 1 | -89/+246 |
* | | | git-p4: support single file p4 client view maps | Gary Gibbons | 2012-01-03 | 1 | -9/+20 |