summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | gitweb: allow extra breadcrumbs to prefix the trailtf/gitweb-extra-breadcrumbsTony Finch2013-07-042-3/+26
* | | | | | | Merge branch 'ms/remote-tracking-branches-in-doc'Junio C Hamano2013-07-126-14/+17
|\ \ \ \ \ \ \
| * | | | | | | Change "remote tracking" to "remote-tracking"ms/remote-tracking-branches-in-docMichael Schubert2013-07-036-14/+17
* | | | | | | | Merge branch 'jk/pull-to-integrate'Junio C Hamano2013-07-123-8/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | pull: change the description to "integrate" changesjk/pull-to-integrateJohn Keeping2013-07-082-2/+2
| * | | | | | | | push: avoid suggesting "merging" remote changesJohn Keeping2013-07-071-6/+6
* | | | | | | | | Merge branch 'jk/maint-config-multi-order'Junio C Hamano2013-07-121-8/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-config(1): clarify precedence of multiple valuesjk/maint-config-multi-orderJohn Keeping2013-07-071-8/+12
| |/ / / / / / / /
* | | | | | | | | Merge branch 'as/log-output-encoding-in-user-format'Junio C Hamano2013-07-129-136/+265
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t4205 (log-pretty-formats): avoid using `sed`as/log-output-encoding-in-user-formatAlexey Shumkin2013-07-051-16/+10
| * | | | | | | | | t6006 (rev-list-format): add tests for "%b" and "%s" for the case i18n.commit...Alexey Shumkin2013-07-051-13/+28
| * | | | | | | | | t4205, t6006, t7102: make functions better readableAlexey Shumkin2013-07-053-25/+16
| * | | | | | | | | t4205 (log-pretty-formats): revert back single quotesAlexey Shumkin2013-07-051-53/+53
| * | | | | | | | | t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1Alexey Shumkin2013-07-054-18/+18
| * | | | | | | | | t4205: replace .\+ with ..* in sed commandsBrian Gernhardt2013-07-011-2/+2
| * | | | | | | | | pretty: --format output should honor logOutputEncodingAlexey Shumkin2013-06-269-28/+35
| * | | | | | | | | pretty: Add failing tests: --format output should honor logOutputEncodingAlexey Shumkin2013-06-264-97/+199
| * | | | | | | | | t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputsAlexey Shumkin2013-06-261-22/+26
| * | | | | | | | | t7102 (reset): don't hardcode SHA-1 in expected outputsAlexey Shumkin2013-06-261-3/+5
| * | | | | | | | | t6006 (rev-list-format): don't hardcode SHA-1 in expected outputsAlexey Shumkin2013-06-261-63/+77
* | | | | | | | | | git-clone.txt: remove the restriction on pushing from a shallow cloneNguyễn Thái Ngọc Duy2013-07-121-5/+7
* | | | | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-07-111-3/+76
* | | | | | | | | | Merge branch 'jc/t1512-fix'Junio C Hamano2013-07-112-11/+23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | get_short_sha1(): correctly disambiguate type-limited abbreviationJunio C Hamano2013-07-011-1/+1
| * | | | | | | | | | t1512: correct leftover constants from earlier editionJunio C Hamano2013-07-011-10/+22
* | | | | | | | | | | Merge branch 'tr/test-v-and-v-subtest-only'Junio C Hamano2013-07-111-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t0000: do not use export X=Ytr/test-v-and-v-subtest-onlyTorsten Bögershausen2013-07-081-1/+2
* | | | | | | | | | | | Merge branch 'af/rebase-i-merge-options'Junio C Hamano2013-07-112-5/+27
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Do not ignore merge options in interactive rebaseaf/rebase-i-merge-optionsArnaud Fontaine2013-07-022-5/+27
* | | | | | | | | | | | | Merge branch 'pb/stash-refuse-to-kill'Junio C Hamano2013-07-115-8/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git stash: avoid data loss when "git stash save" kills a directoryPetr Baudis2013-07-013-2/+40
| * | | | | | | | | | | | | treat_directory(): do not declare submodules to be untrackedJunio C Hamano2013-07-012-6/+21
* | | | | | | | | | | | | | Merge branch 'jc/maint-diff-core-safecrlf'Junio C Hamano2013-07-112-1/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | diff: demote core.safecrlf=true to core.safecrlf=warnJunio C Hamano2013-06-252-1/+17
* | | | | | | | | | | | | | | Merge branch 'jg/status-config'Junio C Hamano2013-07-114-19/+135
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | status/commit: make sure --porcelain is not affected by user-facing configJunio C Hamano2013-06-243-22/+61
| * | | | | | | | | | | | | | | commit: make it work with status.shortRamkumar Ramachandra2013-06-241-0/+1
| * | | | | | | | | | | | | | | status: introduce status.branch to enable --branch by defaultJorge Juan Garcia Garcia2013-06-243-0/+35
| * | | | | | | | | | | | | | | status: introduce status.short to enable --short by defaultJorge Juan Garcia Garcia2013-06-243-0/+41
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/bash-completion'Junio C Hamano2013-07-112-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | completion: learn about --man-pathJohn Keeping2013-06-302-0/+2
| * | | | | | | | | | | | | | | completion: handle unstuck form of base git optionsJohn Keeping2013-06-301-1/+2
* | | | | | | | | | | | | | | | Merge branch 'rr/rebase-checkout-reflog'Junio C Hamano2013-07-114-27/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | checkout: respect GIT_REFLOG_ACTIONRamkumar Ramachandra2013-06-172-7/+12
| * | | | | | | | | | | | | | | | status: do not depend on rebase reflog messagesRamkumar Ramachandra2013-06-172-21/+21
| * | | | | | | | | | | | | | | | t/t2021-checkout-last: "checkout -" should work after a rebase finishesRamkumar Ramachandra2013-06-171-0/+34
| * | | | | | | | | | | | | | | | wt-status: remove unused field in grab_1st_switch_cbdataRamkumar Ramachandra2013-06-171-2/+0
| * | | | | | | | | | | | | | | | t7512: test "detached from" as wellJunio C Hamano2013-06-171-1/+9
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jc/triangle-push-fixup'Junio C Hamano2013-07-113-46/+142
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t/t5528-push-default: test pushdefault workflowsRamkumar Ramachandra2013-06-241-0/+57