Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'aw/git-p4-deletion' | Junio C Hamano | 2010-11-05 | 1 | -1/+3 |
|\ | |||||
| * | Fix handling of git-p4 on deleted files | Andrew Waters | 2010-10-22 | 1 | -1/+3 |
* | | contrib/ciabot: git-describe commit instead of HEAD | Sven Eckelmann | 2010-10-29 | 1 | -1/+1 |
* | | completion: fix zsh check under bash with 'set -u' | Mark Lodato | 2010-10-28 | 1 | -3/+3 |
* | | Merge branch 'ab/require-perl-5.8' | Junio C Hamano | 2010-10-26 | 2 | -2/+3 |
|\ \ | |||||
| * | | perl: use "use warnings" instead of -w | Ævar Arnfjörð Bjarmason | 2010-09-27 | 2 | -2/+3 |
* | | | Merge branch 'kf/post-receive-sample-hook' | Junio C Hamano | 2010-10-26 | 1 | -16/+31 |
|\ \ \ | |||||
| * | | | post-receive-email: ensure sent messages are not empty | Kevin P. Fleming | 2010-09-10 | 1 | -16/+31 |
* | | | | Merge branch 'ml/completion-zsh' | Junio C Hamano | 2010-10-26 | 1 | -4/+46 |
|\ \ \ \ | |||||
| * | | | | completion: make compatible with zsh | Mark Lodato | 2010-09-09 | 1 | -4/+46 |
| | |/ / | |/| | | |||||
* | | | | {cvs,svn}import: use the new 'git read-tree --empty' | Thomas Rast | 2010-10-19 | 1 | -1/+1 |
* | | | | Merge branch 'gb/shell-ext' | Junio C Hamano | 2010-09-29 | 3 | -0/+46 |
|\ \ \ \ | |||||
| * | | | | Add sample commands for git-shell | Greg Brockman | 2010-08-12 | 3 | -0/+46 |
* | | | | | contrib/completion: --no-index option to git diff | Michael J Gruber | 2010-09-27 | 1 | -1/+1 |
* | | | | | prefer test -h over test -L in shell scripts | Jeff King | 2010-09-27 | 1 | -1/+1 |
| |/ / / |/| | | | |||||
* | | | | Merge branch 'jn/update-contrib-example-merge' | Junio C Hamano | 2010-09-03 | 1 | -25/+90 |
|\ \ \ \ | |||||
| * | | | | merge script: learn --[no-]rerere-autoupdate | Jonathan Nieder | 2010-08-18 | 1 | -2/+5 |
| * | | | | merge script: notice @{-1} shorthand | Jonathan Nieder | 2010-08-18 | 1 | -2/+4 |
| * | | | | merge script: handle --no-ff --no-commit correctly | Jonathan Nieder | 2010-08-18 | 1 | -2/+10 |
| * | | | | merge script: --ff-only to disallow true merge | Jonathan Nieder | 2010-08-18 | 1 | -2/+15 |
| * | | | | merge script: handle many-way octopus | Jonathan Nieder | 2010-08-18 | 1 | -3/+3 |
| * | | | | merge script: handle -m --log correctly | Jonathan Nieder | 2010-08-18 | 1 | -4/+10 |
| * | | | | merge script: forbid merge -s index | Jonathan Nieder | 2010-08-18 | 1 | -0/+5 |
| * | | | | merge script: allow custom strategies | Jonathan Nieder | 2010-08-18 | 1 | -2/+6 |
| * | | | | merge script: merge -X<option> | Jonathan Nieder | 2010-08-18 | 1 | -1/+7 |
| * | | | | merge script: improve log message subject | Jonathan Nieder | 2010-08-18 | 1 | -8/+19 |
| * | | | | merge script: refuse to merge during merge | Jonathan Nieder | 2010-08-18 | 1 | -0/+3 |
| * | | | | merge script: tweak unmerged files message to match builtin | Jonathan Nieder | 2010-08-18 | 1 | -1/+1 |
| * | | | | merge script: --squash, --ff from unborn branch are errors | Jonathan Nieder | 2010-08-18 | 1 | -0/+4 |
| |/ / / | |||||
* | | | | Merge branch 'jn/cherry-revert-message-clean-up' | Junio C Hamano | 2010-08-31 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * | | | | Eliminate “Finished cherry-pick/revert” message | Jonathan Nieder | 2010-08-15 | 1 | -1/+0 |
* | | | | | Merge branch 'jn/svn-fe' | Junio C Hamano | 2010-08-31 | 2 | -9/+11 |
|\ \ \ \ \ | |||||
| * | | | | | svn-fe manual: Clarify warning about deltas in dump files | Jonathan Nieder | 2010-08-14 | 1 | -1/+4 |
| * | | | | | Update svn-fe manual | Jonathan Nieder | 2010-08-14 | 1 | -8/+6 |
| * | | | | | SVN dump parser | David Barr | 2010-08-14 | 1 | -0/+1 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-08-22 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Typos in code comments, an error message, documentation | Ralf Wildenhues | 2010-08-22 | 1 | -2/+2 |
| * | | | | | | Merge branch 'jn/fix-abbrev' into maint | Junio C Hamano | 2010-08-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jn/fix-abbrev' | Junio C Hamano | 2010-08-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | examples/commit: use --abbrev for commit summary | Jonathan Nieder | 2010-07-27 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'kf/post-receive-sample-hook' | Junio C Hamano | 2010-08-18 | 1 | -2/+32 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | post-receive-email: optional message line count limit | Kevin P. Fleming | 2010-07-16 | 1 | -2/+32 |
| | |/ / | |/| | | |||||
* | | | | post-receive-email: remove spurious commas in email subject | Matthieu Moy | 2010-08-11 | 1 | -1/+1 |
* | | | | contrib/svn-fe: Add the svn-fe target to .gitignore | Ramkumar Ramachandra | 2010-08-03 | 1 | -0/+1 |
* | | | | contrib/svn-fe: Fix IncludePath | Ramkumar Ramachandra | 2010-08-03 | 2 | -2/+2 |
| |/ / |/| | | |||||
* | | | Add a sample user for the svndump library | Jonathan Nieder | 2010-07-16 | 4 | -0/+147 |
|/ / | |||||
* | | Merge branch 'tr/rev-list-count' | Junio C Hamano | 2010-06-30 | 1 | -1/+143 |
|\ \ | |||||
| * | | bash completion: Support "divergence from upstream" messages in __git_ps1 | Andrew Sayers | 2010-06-24 | 1 | -1/+143 |
* | | | Merge branch 'as/maint-completion-set-u-fix' | Junio C Hamano | 2010-06-30 | 1 | -7/+7 |
|\ \ \ | |||||
| * | | | bash-completion: Fix __git_ps1 to work with "set -u" | Andrew Sayers | 2010-06-18 | 1 | -7/+7 |