Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ss/mergetool--lib' | Junio C Hamano | 2011-03-19 | 1 | -1/+1 |
|\ | |||||
| * | mergetool--lib: Add Beyond Compare 3 as a tool | Sebastian Schuberth | 2011-02-28 | 1 | -1/+1 |
* | | Merge branch 'pw/p4' | Junio C Hamano | 2011-03-13 | 1 | -1/+1 |
|\ \ | |||||
| * | | git-p4: fix clone @all regression | Pete Wyckoff | 2011-03-13 | 1 | -1/+1 |
* | | | Merge branch 'js/cherry-pick-usability' | Junio C Hamano | 2011-03-09 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | bash: teach __git_ps1 about CHERRY_PICK_HEAD | Jay Soffian | 2011-02-21 | 1 | -0/+2 |
* | | | | Merge branch 'mh/p4' | Junio C Hamano | 2011-03-04 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | git-p4 submit: prevent 'Jobs' section from being removed from p4 change log | Michael Horowitz | 2011-02-25 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'svn-fe' of git://repo.or.cz/git/jrn | Junio C Hamano | 2011-02-28 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge commit 'jn/svn-fe' of git://github.com/gitster/git into svn-fe | Jonathan Nieder | 2011-02-26 | 1 | -1/+2 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | vcs-svn: Check for errors from open() | Jonathan Nieder | 2010-11-24 | 1 | -1/+2 |
* | | | | | Merge branch 'va/p4' | Junio C Hamano | 2011-02-27 | 1 | -4/+31 |
|\ \ \ \ \ | |||||
| * | | | | | git-p4: Add copy detection support | Vitor Antunes | 2011-02-21 | 1 | -0/+16 |
| * | | | | | git-p4: Improve rename detection support | Vitor Antunes | 2011-02-21 | 1 | -4/+15 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'pw/p4' | Junio C Hamano | 2011-02-27 | 1 | -11/+49 |
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | git-p4: support clone --bare | Pete Wyckoff | 2011-02-21 | 1 | -4/+13 |
| * | | | git-p4: decode p4 wildcard characters | Pete Wyckoff | 2011-02-21 | 1 | -0/+18 |
| * | | | git-p4: better message for "git-p4 sync" when not cloned | Pete Wyckoff | 2011-02-21 | 1 | -0/+2 |
| * | | | git-p4: reinterpret confusing p4 message | Pete Wyckoff | 2011-02-21 | 1 | -0/+4 |
| * | | | git-p4: accommodate new move/delete type in p4 | Pete Wyckoff | 2011-02-21 | 1 | -5/+7 |
| * | | | git-p4: add missing newline in initial import message | Pete Wyckoff | 2011-02-21 | 1 | -1/+1 |
| * | | | git-p4: fix key error for p4 problem | Pete Wyckoff | 2011-02-21 | 1 | -1/+4 |
| |/ / | |||||
* | | | Obey p4 views when using client spec | Ian Wienand | 2011-02-14 | 2 | -4/+51 |
* | | | Merge branch 'maint' | Junio C Hamano | 2011-02-11 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | svn-fe: warn about experimental status | Jonathan Nieder | 2011-02-11 | 1 | -0/+3 |
* | | | | Merge branch 'jn/cherry-pick-strategy-option' | Junio C Hamano | 2011-02-09 | 1 | -1/+12 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | cherry-pick/revert: add support for -X/--strategy-option | Jonathan Nieder | 2010-12-28 | 1 | -1/+12 |
| |/ / | |||||
* | | | post-receive-email: suppress error if description file missing | Sitaram Chamarty | 2011-02-07 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'pd/bash-4-completion' | Junio C Hamano | 2010-12-22 | 1 | -78/+290 |
|\ \ | |||||
| * \ | Merge branch 'master' (early part) into pd/bash-4-completion | Jonathan Nieder | 2010-12-15 | 12 | -61/+288 |
| |\ \ | |||||
| * | | | bash: simple reimplementation of _get_comp_words_by_ref | Jonathan Nieder | 2010-12-14 | 1 | -8/+110 |
| * | | | bash: get --pretty=m<tab> completion to work with bash v4 | Peter van der Does | 2010-12-14 | 1 | -76/+160 |
* | | | | Merge branch 'tc/completion-reflog' | Junio C Hamano | 2010-12-21 | 1 | -1/+12 |
|\ \ \ \ | |||||
| * | | | | bash completion: add basic support for git-reflog | Tay Ray Chuan | 2010-12-17 | 1 | -1/+12 |
* | | | | | completion: add missing configuration variables | Martin von Zweigbergk | 2010-12-20 | 1 | -4/+66 |
|/ / / / | |||||
* | | | | Merge branch 'maint' | Junio C Hamano | 2010-12-09 | 1 | -4/+4 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'ab/require-perl-5.8' into maint | Junio C Hamano | 2010-12-09 | 2 | -2/+3 |
| |\ \ \ \ | |||||
| * | | | | | contrib/hooks/post-receive-email: fix return values from prep_for_email | Alan Raison | 2010-12-09 | 1 | -4/+4 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-12-01 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'maint-1.7.2' into maint | Junio C Hamano | 2010-12-01 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | bash: Match lightweight tags in prompt | knittl | 2010-12-01 | 1 | -1/+1 |
| * | | | | | Merge branch 'dk/maint-blame-el' into maint | Junio C Hamano | 2010-11-24 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'aw/git-p4-deletion' into maint | Junio C Hamano | 2010-11-24 | 1 | -1/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'kf/post-receive-sample-hook' into maint | Junio C Hamano | 2010-11-24 | 1 | -16/+31 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'mm/phrase-remote-tracking' | Junio C Hamano | 2010-11-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Change incorrect "remote branch" to "remote tracking branch" in C code | Matthieu Moy | 2010-11-03 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'kb/completion-checkout' | Junio C Hamano | 2010-11-17 | 1 | -3/+27 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | completion: Support the DWIM mode for git checkout | Kevin Ballard | 2010-10-13 | 1 | -3/+27 |
* | | | | | | | | | | Merge branch 'sg/completion' | Junio C Hamano | 2010-11-17 | 1 | -15/+64 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | bash: support pretty format aliases | SZEDER Gábor | 2010-10-13 | 1 | -4/+17 |