| commit | 18102d359388b04ba2ad7ecee99c597e721f8f50 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Feb 2013 00:06:47 +0000 (18 16:06 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Feb 2013 00:06:47 +0000 (18 16:06 -0800) | ||
| tree | 393fc51854b5a6f6d7785575fee4ccd1a619f14b | treesnapshot (tar.gz zip) |
| parent | d5506403242cc53e746fff0d1fac527980137c3b | commitdiff |
| parent | 20a599e2c18dd5b491257d7f8aeb2d2f02221595 | commitdiff |
Merge branch 'master' into next
* master:
RelNotes 1.8.2: push-simple will not be in effect in this release
shell-prompt: clean up nested if-then
* master:
RelNotes 1.8.2: push-simple will not be in effect in this release
shell-prompt: clean up nested if-then