| Commit message (Expand) | Author | Age | Files | Lines |
* | contrib/hooks: adapt comment about Debian install location for contrib hooks | Gerrit Pape | 2011-09-26 | 1 | -2/+2 |
* | Merge branch 'va/p4-branch-import' | Junio C Hamano | 2011-08-28 | 2 | -9/+84 |
|\ |
|
| * | git-p4: Allow branch definition with git config | Vitor Antunes | 2011-08-22 | 2 | -0/+31 |
| * | git-p4: Allow filtering Perforce branches by user | Vitor Antunes | 2011-08-22 | 2 | -1/+13 |
| * | git-p4: Correct branch base depot path detection | Vitor Antunes | 2011-08-22 | 1 | -3/+5 |
| * | git-p4: Process detectCopiesHarder with --bool | Vitor Antunes | 2011-08-22 | 1 | -1/+1 |
| * | git-p4: Add description of rename/copy detection options | Vitor Antunes | 2011-08-22 | 1 | -0/+25 |
| * | git-p4: Allow setting rename/copy detection threshold | Vitor Antunes | 2011-08-22 | 1 | -4/+9 |
* | | Merge branch 'js/ref-namespaces' | Junio C Hamano | 2011-08-17 | 1 | -1/+2 |
|\ \ |
|
| * | | ref namespaces: documentation | Josh Triplett | 2011-07-11 | 1 | -1/+1 |
| * | | ref namespaces: infrastructure | Josh Triplett | 2011-07-06 | 1 | -0/+1 |
* | | | Add option hooks.diffopts to customize change summary in post-receive-email | Jon Jensen | 2011-08-04 | 1 | -1/+8 |
| |/
|/| |
|
* | | git-p4: commit time should be most recent p4 change time | Pete Wyckoff | 2011-08-01 | 1 | -1/+14 |
* | | Documentation: use [verse] for SYNOPSIS sections | Martin von Zweigbergk | 2011-07-06 | 3 | -0/+3 |
* | | Merge branch 'maint' | Junio C Hamano | 2011-06-26 | 1 | -1/+1 |
|\ \ |
|
| * \ | Merge branch 'maint-1.7.4' into maint | Junio C Hamano | 2011-06-24 | 1 | -1/+1 |
| |\ \ |
|
| | * | | completion: replace core.abbrevguard to core.abbrev | Namhyung Kim | 2011-06-24 | 1 | -1/+1 |
* | | | | Merge branch 'mk/grep-pcre' | Junio C Hamano | 2011-05-30 | 1 | -1/+2 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | git-grep: Learn PCRE | Michał Kiedrowicz | 2011-05-09 | 1 | -0/+1 |
| * | | | contrib/completion: --line-number to git grep | Michał Kiedrowicz | 2011-05-05 | 1 | -1/+1 |
* | | | | Merge branch 'ld/p4-preserve-user-names' | Junio C Hamano | 2011-05-19 | 2 | -38/+215 |
|\ \ \ \ |
|
| * | | | | git-p4: warn if git authorship won't be retained | Luke Diamand | 2011-05-13 | 2 | -2/+38 |
| * | | | | 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 | 2 | -38/+170 |
| |/ / / |
|
* | | | | Merge branch 'sg/completion-updates' | Junio C Hamano | 2011-05-16 | 1 | -4/+16 |
|\ \ \ \ |
|
| * \ \ \ | Merge branch 'fc/completion-zsh' into sg/completion-updates | Junio C Hamano | 2011-05-10 | 1 | -0/+8 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | * | | | git-completion: fix regression in zsh support | Felipe Contreras | 2011-05-10 | 1 | -0/+8 |
| | |/ / |
|
| * | | | Revert "completion: don't declare 'local words' to make zsh happy" | Junio C Hamano | 2011-05-10 | 1 | -6/+2 |
| * | | | completion: move private shopt shim for zsh to __git_ namespace | Jonathan Nieder | 2011-05-08 | 1 | -4/+8 |
| * | | | completion: don't declare 'local words' to make zsh happy | SZEDER Gábor | 2011-04-28 | 1 | -2/+6 |
* | | | | Merge branch 'sg/completion-cleanup' | Junio C Hamano | 2011-05-06 | 1 | -161/+60 |
|\ \ \ \
| |/ / / |
|
| * | | | completion: remove unnecessary _get_comp_words_by_ref() invocations | SZEDER Gábor | 2011-04-28 | 1 | -105/+11 |
| * | | | completion: don't modify the $cur variable in completion functions | SZEDER Gábor | 2011-04-28 | 1 | -57/+50 |
* | | | | Merge branch 'jk/notes-ui-updates' | Junio C Hamano | 2011-05-02 | 1 | -1/+1 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | contrib/completion: --notes, --no-notes | Michael J Gruber | 2011-04-14 | 1 | -1/+1 |
* | | | | Automatically autoload bashcompinit for ZSH, when needed | Marius Storm-Olsen | 2011-04-27 | 1 | -8/+8 |
| |/ /
|/| | |
|
* | | | git-p4: replace each tab with 8 spaces for consistency | Andrew Garber | 2011-04-07 | 1 | -32/+32 |
* | | | git.el: Don't use font-lock-compile-keywords | Lawrence Mitchell | 2011-04-03 | 1 | -3/+10 |
* | | | Merge branch 'maint' | Junio C Hamano | 2011-03-30 | 1 | -2/+2 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | contrib/thunderbird-patch-inline: do not require bash to run the script | Maxin john | 2011-03-30 | 1 | -2/+2 |
* | | Merge branch 'mg/rev-list-n-parents' | Junio C Hamano | 2011-03-26 | 1 | -0/+2 |
|\ \ |
|
| * | | rev-list --min-parents,--max-parents: doc, test and completion | Michael J Gruber | 2011-03-23 | 1 | -0/+2 |
* | | | Merge branch 'jp/completion-help-alias' | Junio C Hamano | 2011-03-26 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | git-completion: Add git help completion for aliases | Jakob Pfender | 2011-03-22 | 1 | -1/+1 |
* | | | | Merge branch 'pw/p4' | Junio C Hamano | 2011-03-23 | 1 | -1/+3 |
|\ \ \ \ |
|
| * | | | | git-p4: fix sync new branch regression | Pete Wyckoff | 2011-03-16 | 1 | -1/+3 |
* | | | | | Merge branch 'tl/p4' | Junio C Hamano | 2011-03-22 | 1 | -10/+27 |
|\ \ \ \ \ |
|
| * | | | | | git-p4: Fix error message crash in P4Sync.commit. | Tor Arvid Lund | 2011-03-15 | 1 | -1/+1 |
| * | | | | | Teach git-p4 to ignore case in perforce filenames if configured. | Tor Arvid Lund | 2011-03-15 | 1 | -7/+20 |
| * | | | | | git-p4: Teach gitConfig method about arguments. | Tor Arvid Lund | 2011-03-15 | 1 | -2/+6 |