summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-svn documentation: minor grammar fixÆvar Arnfjörð Bjarmason2010-05-091-1/+1
* git svn: avoid uninitialized var in 'reset'Jonathan Nieder2010-05-091-0/+2
* Start 1.7.2 cycleJunio C Hamano2010-05-083-2/+42
* Merge branch 'bg/apply-blank-trailing-context'Junio C Hamano2010-05-082-6/+18
|\
| * apply: Allow blank *trailing* context lines to match beyond EOFBjörn Gustavsson2010-04-072-6/+18
* | Merge branch 'bg/send-email-smtpdomain'Junio C Hamano2010-05-083-26/+30
|\ \
| * | send-email: Cleanup smtp-domain and add configBrian Gernhardt2010-04-103-11/+12
| * | Document send-email --smtp-domainBrian Gernhardt2010-04-101-0/+6
| * | send-email: Don't use FQDNs without a '.'Brian Gernhardt2010-04-101-4/+7
| * | send-email: Cleanup { styleBrian Gernhardt2010-04-101-12/+6
* | | Merge branch 'rc/ls-remote-default'Junio C Hamano2010-05-082-4/+65
|\ \ \
| * | | ls-remote: fall-back to default remotes when no remote specifiedTay Ray Chuan2010-04-082-4/+65
* | | | Merge branch 'rc/maint-curl-helper'Junio C Hamano2010-05-084-8/+38
|\ \ \ \
| * | | | remote-curl: ensure that URLs have a trailing slashTay Ray Chuan2010-04-092-7/+9
| * | | | http: make end_url_with_slash() publicTay Ray Chuan2010-04-092-1/+2
| * | | | t5541-http-push: add test for URLs with trailing slashTay Ray Chuan2010-04-091-1/+28
* | | | | Merge branch 'hg/maint-attr-fix'Junio C Hamano2010-05-082-14/+39
|\ \ \ \ \
| * | | | | attr: Expand macros immediately when encountered.Henrik Grubbström2010-04-102-12/+29
| * | | | | attr: Allow multiple changes to an attribute on the same line.Henrik Grubbström2010-04-102-1/+7
| * | | | | attr: Fixed debug output for macro expansion.Henrik Grubbström2010-04-101-1/+3
* | | | | | Merge branch 'eb/unpretty-b-format'Junio C Hamano2010-05-083-0/+14
|\ \ \ \ \ \
| * | | | | | Add `%B' in format strings for raw commit body in `git log' and friendsEli Barzilay2010-04-053-0/+14
* | | | | | | Merge branch 'ab/commit-empty-message'Junio C Hamano2010-05-083-4/+38
|\ \ \ \ \ \ \
| * | | | | | | Add option to git-commit to allow empty log messagesÆvar Arnfjörð Bjarmason2010-04-073-4/+38
* | | | | | | | Merge branch 'jc/test-sleepless'Junio C Hamano2010-05-083-6/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | war on "sleep" in testsJunio C Hamano2010-04-063-6/+7
| |/ / / / / / /
* | | | | | | | Merge branch 'jc/maint-reflog-expire-unreachable'Junio C Hamano2010-05-081-40/+56
|\ \ \ \ \ \ \ \
| * | | | | | | | reflog --expire-unreachable: avoid merge-base computationJunio C Hamano2010-04-071-40/+56
* | | | | | | | | Merge branch 'sd/log-decorate'Junio C Hamano2010-05-088-13/+118
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | log.decorate: only ignore it under "log --pretty=raw"Junio C Hamano2010-04-082-30/+19
| * | | | | | | | | script with rev-list instead of logJeff King2010-04-082-2/+2
| * | | | | | | | | log --pretty/--oneline: ignore log.decorateJunio C Hamano2010-04-062-16/+39
| * | | | | | | | | log.decorate: usability fixesJunio C Hamano2010-02-173-11/+76
| * | | | | | | | | Add `log.decorate' configuration variable.Steven Drake2010-02-172-1/+15
| * | | | | | | | | git_config_maybe_bool()Junio C Hamano2010-02-172-4/+18
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mh/status-optionally-refresh'Junio C Hamano2010-05-082-0/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t7508: add a test for "git status" in a read-only repositoryMarkus Heidelberg2010-04-031-0/+15
| * | | | | | | | | git status: refresh the index if possibleMarkus Heidelberg2010-04-022-1/+10
| * | | | | | | | | t7508: add test for "git status" refreshing the indexMarkus Heidelberg2010-04-021-0/+10
* | | | | | | | | | Merge branch 'cw/ws-indent-with-tab'Junio C Hamano2010-05-086-85/+162
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | whitespace: tests for git-apply --whitespace=fix with tab-in-indentChris Webb2010-04-041-24/+29
| * | | | | | | | | | whitespace: add tab-in-indent support for --whitespace=fixChris Webb2010-04-041-0/+14
| * | | | | | | | | | whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dstChris Webb2010-04-043-54/+48
| * | | | | | | | | | whitespace: tests for git-diff --check with tab-in-indent error classChris Webb2010-04-041-0/+42
| * | | | | | | | | | whitespace: add tab-in-indent error classChris Webb2010-04-023-5/+25
| * | | | | | | | | | whitespace: we cannot "catch all errors known to git" anymoreJunio C Hamano2010-04-021-2/+4
* | | | | | | | | | | Merge branch 'cc/revert-strategy'Junio C Hamano2010-05-083-110/+153
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | revert: add "--strategy" option to choose merge strategyChristian Couder2010-04-011-2/+23
| * | | | | | | | | | | merge: make function try_merge_command non staticChristian Couder2010-04-012-2/+5
| * | | | | | | | | | | merge: refactor code that calls "git merge-STRATEGY"Christian Couder2010-04-011-36/+45