Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-svn documentation: minor grammar fix | Ævar Arnfjörð Bjarmason | 2010-05-09 | 1 | -1/+1 |
* | git svn: avoid uninitialized var in 'reset' | Jonathan Nieder | 2010-05-09 | 1 | -0/+2 |
* | Start 1.7.2 cycle | Junio C Hamano | 2010-05-08 | 3 | -2/+42 |
* | Merge branch 'bg/apply-blank-trailing-context' | Junio C Hamano | 2010-05-08 | 2 | -6/+18 |
|\ | |||||
| * | apply: Allow blank *trailing* context lines to match beyond EOF | Björn Gustavsson | 2010-04-07 | 2 | -6/+18 |
* | | Merge branch 'bg/send-email-smtpdomain' | Junio C Hamano | 2010-05-08 | 3 | -26/+30 |
|\ \ | |||||
| * | | send-email: Cleanup smtp-domain and add config | Brian Gernhardt | 2010-04-10 | 3 | -11/+12 |
| * | | Document send-email --smtp-domain | Brian Gernhardt | 2010-04-10 | 1 | -0/+6 |
| * | | send-email: Don't use FQDNs without a '.' | Brian Gernhardt | 2010-04-10 | 1 | -4/+7 |
| * | | send-email: Cleanup { style | Brian Gernhardt | 2010-04-10 | 1 | -12/+6 |
* | | | Merge branch 'rc/ls-remote-default' | Junio C Hamano | 2010-05-08 | 2 | -4/+65 |
|\ \ \ | |||||
| * | | | ls-remote: fall-back to default remotes when no remote specified | Tay Ray Chuan | 2010-04-08 | 2 | -4/+65 |
* | | | | Merge branch 'rc/maint-curl-helper' | Junio C Hamano | 2010-05-08 | 4 | -8/+38 |
|\ \ \ \ | |||||
| * | | | | remote-curl: ensure that URLs have a trailing slash | Tay Ray Chuan | 2010-04-09 | 2 | -7/+9 |
| * | | | | http: make end_url_with_slash() public | Tay Ray Chuan | 2010-04-09 | 2 | -1/+2 |
| * | | | | t5541-http-push: add test for URLs with trailing slash | Tay Ray Chuan | 2010-04-09 | 1 | -1/+28 |
* | | | | | Merge branch 'hg/maint-attr-fix' | Junio C Hamano | 2010-05-08 | 2 | -14/+39 |
|\ \ \ \ \ | |||||
| * | | | | | attr: Expand macros immediately when encountered. | Henrik Grubbström | 2010-04-10 | 2 | -12/+29 |
| * | | | | | attr: Allow multiple changes to an attribute on the same line. | Henrik Grubbström | 2010-04-10 | 2 | -1/+7 |
| * | | | | | attr: Fixed debug output for macro expansion. | Henrik Grubbström | 2010-04-10 | 1 | -1/+3 |
* | | | | | | Merge branch 'eb/unpretty-b-format' | Junio C Hamano | 2010-05-08 | 3 | -0/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add `%B' in format strings for raw commit body in `git log' and friends | Eli Barzilay | 2010-04-05 | 3 | -0/+14 |
* | | | | | | | Merge branch 'ab/commit-empty-message' | Junio C Hamano | 2010-05-08 | 3 | -4/+38 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add option to git-commit to allow empty log messages | Ævar Arnfjörð Bjarmason | 2010-04-07 | 3 | -4/+38 |
* | | | | | | | | Merge branch 'jc/test-sleepless' | Junio C Hamano | 2010-05-08 | 3 | -6/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | war on "sleep" in tests | Junio C Hamano | 2010-04-06 | 3 | -6/+7 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jc/maint-reflog-expire-unreachable' | Junio C Hamano | 2010-05-08 | 1 | -40/+56 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | reflog --expire-unreachable: avoid merge-base computation | Junio C Hamano | 2010-04-07 | 1 | -40/+56 |
* | | | | | | | | | Merge branch 'sd/log-decorate' | Junio C Hamano | 2010-05-08 | 8 | -13/+118 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | log.decorate: only ignore it under "log --pretty=raw" | Junio C Hamano | 2010-04-08 | 2 | -30/+19 |
| * | | | | | | | | | script with rev-list instead of log | Jeff King | 2010-04-08 | 2 | -2/+2 |
| * | | | | | | | | | log --pretty/--oneline: ignore log.decorate | Junio C Hamano | 2010-04-06 | 2 | -16/+39 |
| * | | | | | | | | | log.decorate: usability fixes | Junio C Hamano | 2010-02-17 | 3 | -11/+76 |
| * | | | | | | | | | Add `log.decorate' configuration variable. | Steven Drake | 2010-02-17 | 2 | -1/+15 |
| * | | | | | | | | | git_config_maybe_bool() | Junio C Hamano | 2010-02-17 | 2 | -4/+18 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'mh/status-optionally-refresh' | Junio C Hamano | 2010-05-08 | 2 | -0/+34 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t7508: add a test for "git status" in a read-only repository | Markus Heidelberg | 2010-04-03 | 1 | -0/+15 |
| * | | | | | | | | | git status: refresh the index if possible | Markus Heidelberg | 2010-04-02 | 2 | -1/+10 |
| * | | | | | | | | | t7508: add test for "git status" refreshing the index | Markus Heidelberg | 2010-04-02 | 1 | -0/+10 |
* | | | | | | | | | | Merge branch 'cw/ws-indent-with-tab' | Junio C Hamano | 2010-05-08 | 6 | -85/+162 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | whitespace: tests for git-apply --whitespace=fix with tab-in-indent | Chris Webb | 2010-04-04 | 1 | -24/+29 |
| * | | | | | | | | | | whitespace: add tab-in-indent support for --whitespace=fix | Chris Webb | 2010-04-04 | 1 | -0/+14 |
| * | | | | | | | | | | whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst | Chris Webb | 2010-04-04 | 3 | -54/+48 |
| * | | | | | | | | | | whitespace: tests for git-diff --check with tab-in-indent error class | Chris Webb | 2010-04-04 | 1 | -0/+42 |
| * | | | | | | | | | | whitespace: add tab-in-indent error class | Chris Webb | 2010-04-02 | 3 | -5/+25 |
| * | | | | | | | | | | whitespace: we cannot "catch all errors known to git" anymore | Junio C Hamano | 2010-04-02 | 1 | -2/+4 |
* | | | | | | | | | | | Merge branch 'cc/revert-strategy' | Junio C Hamano | 2010-05-08 | 3 | -110/+153 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | revert: add "--strategy" option to choose merge strategy | Christian Couder | 2010-04-01 | 1 | -2/+23 |
| * | | | | | | | | | | | merge: make function try_merge_command non static | Christian Couder | 2010-04-01 | 2 | -2/+5 |
| * | | | | | | | | | | | merge: refactor code that calls "git merge-STRATEGY" | Christian Couder | 2010-04-01 | 1 | -36/+45 |