Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge branch 'pw/p4-appledouble-fix' | Junio C Hamano | 2011-11-06 | 1 | -0/+13 | |
|\ \ \ \ \ | ||||||
| * | | | | | git-p4: ignore apple filetype | Pete Wyckoff | 2011-11-05 | 1 | -0/+13 | |
* | | | | | | Merge branch 'jk/git-tricks' | Junio C Hamano | 2011-10-30 | 5 | -0/+355 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | completion: match ctags symbol names in grep patterns | Jeff King | 2011-10-21 | 1 | -0/+13 | |
| * | | | | | | contrib: add git-jump script | Jeff King | 2011-10-21 | 2 | -0/+161 | |
| * | | | | | | contrib: add diff highlight script | Jeff King | 2011-10-18 | 2 | -0/+181 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge branch 'sn/complete-bash-wo-process-subst' | Junio C Hamano | 2011-10-27 | 1 | -1/+2 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | completion: fix issue with process substitution not working on Git for Windows | Stefan Naewe | 2011-10-26 | 1 | -1/+2 | |
* | | | | | | Merge branch 'mm/mediawiki-author-fix' | Junio C Hamano | 2011-10-26 | 1 | -0/+4 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | git-remote-mediawiki: don't include HTTP login/password in author | Matthieu Moy | 2011-10-20 | 1 | -0/+4 | |
* | | | | | | Merge branch 'pw/p4-update' | Junio C Hamano | 2011-10-21 | 1 | -99/+188 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | git-p4: handle files with shell metacharacters | Luke Diamand | 2011-10-17 | 1 | -77/+123 | |
| * | | | | | git-p4: keyword flattening fixes | Pete Wyckoff | 2011-10-17 | 1 | -2/+6 | |
| | |/ / / | |/| | | | ||||||
| * | | | | git-p4: stop ignoring apple filetype | Pete Wyckoff | 2011-10-17 | 1 | -5/+0 | |
| * | | | | git-p4: recognize all p4 filetypes | Pete Wyckoff | 2011-10-17 | 1 | -19/+52 | |
| * | | | | git-p4: handle utf16 filetype properly | Pete Wyckoff | 2011-10-17 | 1 | -0/+11 | |
* | | | | | Merge branch 'sg/completion' | Junio C Hamano | 2011-10-17 | 1 | -18/+6 | |
|\ \ \ \ \ | ||||||
| * | | | | | completion: unite --format and --pretty for 'log' and 'show' | SZEDER Gábor | 2011-10-10 | 1 | -14/+4 | |
| * | | | | | completion: unite --reuse-message and --reedit-message for 'notes' | SZEDER Gábor | 2011-10-10 | 1 | -4/+2 | |
* | | | | | | Merge branch 'tm/completion-push-set-upstream' | Junio C Hamano | 2011-10-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | completion: push --set-upstreamtm/completion-push-set-upstream | Teemu Matilainen | 2011-10-06 | 1 | -1/+1 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge branch 'tm/completion-commit-fixup-squash' | Junio C Hamano | 2011-10-17 | 1 | -7/+4 | |
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | | | ||||||
| * | | | | completion: commit --fixup and --squashtm/completion-commit-fixup-squash | Teemu Matilainen | 2011-10-06 | 1 | -2/+3 | |
| * | | | | completion: unite --reuse-message and --reedit-message handling | Teemu Matilainen | 2011-10-06 | 1 | -6/+2 | |
| |/ / / | ||||||
* | | | | Merge branch 'mm/mediawiki-as-a-remote' | Junio C Hamano | 2011-10-05 | 2 | -0/+830 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | git-remote-mediawiki: allow a domain to be set for authentication | Matthieu Moy | 2011-09-28 | 1 | -0/+3 | |
| * | | | git-remote-mediawiki: obey advice.pushNonFastForward | Matthieu Moy | 2011-09-27 | 1 | -7/+10 | |
| * | | | git-remote-mediawiki: set 'basetimestamp' to let the wiki handle conflicts | Matthieu Moy | 2011-09-27 | 1 | -6/+37 | |
| * | | | git-remote-mediawiki: trivial fixes | Matthieu Moy | 2011-09-27 | 1 | -2/+1 | |
| * | | | git-remote-mediawiki: allow push to set MediaWiki metadata | Matthieu Moy | 2011-09-01 | 1 | -2/+33 | |
| * | | | Add a remote helper to interact with mediawiki (fetch & push) | Jeremie Nikaes | 2011-09-01 | 2 | -0/+763 | |
* | | | | 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 |