summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bc/submodule-status-ignored'Jonathan Nieder2013-09-247-11/+55
|\
| * Improve documentation concerning the status.submodulesummary settingbc/submodule-status-ignoredJens Lehmann2013-09-114-5/+24
| * submodule: don't print status output with ignore=allBrian M. Carlson2013-09-043-2/+27
| * submodule: fix confusing variable nameBrian M. Carlson2013-09-031-4/+4
* | Merge branch 'cc/replace-with-the-same-type'Jonathan Nieder2013-09-243-9/+61
|\ \
| * | Doc: 'replace' merge and non-merge commitscc/replace-with-the-same-typePhilip Oakley2013-09-091-0/+1
| * | t6050-replace: use some long option namesChristian Couder2013-09-061-4/+4
| * | replace: allow long option namesChristian Couder2013-09-062-3/+6
| * | Documentation/replace: add Creating Replacement Objects sectionChristian Couder2013-09-061-0/+16
| * | t6050-replace: add test to clean up all the replace refsChristian Couder2013-09-061-0/+6
| * | t6050-replace: test that objects are of the same typeChristian Couder2013-09-061-0/+13
| * | Documentation/replace: state that objects must be of the same typeChristian Couder2013-09-061-3/+6
| * | replace: forbid replacing an object with one of a different typeChristian Couder2013-09-061-0/+10
* | | Merge branch 'kb/msvc-compile'Jonathan Nieder2013-09-247-23/+32
|\ \ \
| * | | Windows: do not redefine _WIN32_WINNTkb/msvc-compileSebastian Schuberth2013-09-113-2/+4
| * | | MinGW: Fix stat definitions to work with MinGW runtime version 4.0Sebastian Schuberth2013-09-113-2/+10
| * | | MSVC: fix stat definition hellKarsten Blees2013-09-112-19/+11
| * | | MSVC: fix compile errors due to macro redefinitionsKarsten Blees2013-09-111-0/+6
| * | | MSVC: fix compile errors due to missing libintl.hKarsten Blees2013-09-111-0/+1
* | | | Merge branch 'nd/unpack-entry-optim-in-pack-objects'Jonathan Nieder2013-09-241-10/+10
|\ \ \ \
| * | | | pack-objects: no crc check when the cached version is usednd/unpack-entry-optim-in-pack-objectsNguyễn Thái Ngọc Duy2013-09-131-10/+10
| | |/ / | |/| |
* | | | Merge branch 'jk/shortlog-tolerate-broken-commit'Jonathan Nieder2013-09-242-2/+20
|\ \ \ \
| * | | | shortlog: ignore commits with missing authorsjk/shortlog-tolerate-broken-commitJeff King2013-09-182-2/+20
* | | | | Merge branch 'jc/strcasecmp-pure-inline'Jonathan Nieder2013-09-241-2/+16
|\ \ \ \ \
| * | | | | mailmap: work around implementations with pure inline strcasecmpjc/strcasecmp-pure-inlineJunio C Hamano2013-09-121-2/+16
| | |/ / / | |/| | |
* | | | | Merge branch 'sg/complete-untracked-filter'Jonathan Nieder2013-09-241-2/+2
|\ \ \ \ \
| * | | | | completion: improve untracked directory filtering for filename completionsg/complete-untracked-filterSZEDER Gábor2013-09-191-2/+2
* | | | | | Merge branch 'nd/fetch-pack-error-reporting-fix'Jonathan Nieder2013-09-241-5/+5
|\ \ \ \ \ \
| * | | | | | fetch-pack.c: show correct command name that failsnd/fetch-pack-error-reporting-fixNguyễn Thái Ngọc Duy2013-09-181-5/+5
* | | | | | | Merge branch 'es/contacts-in-subdir'Jonathan Nieder2013-09-241-0/+4
|\ \ \ \ \ \ \
| * | | | | | | contacts: fix to work in subdirectorieses/contacts-in-subdirEric Sunshine2013-09-171-0/+4
* | | | | | | | Merge branch 'jc/push-cas'Jonathan Nieder2013-09-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | t5541: mark passing c-a-s test as successjc/push-casJeff King2013-09-201-1/+1
* | | | | | | | | Merge branch 'maint'Jonathan Nieder2013-09-242-2/+35
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-remote-mediawiki: bugfix for pages w/ >500 revisionsBenoit Person2013-09-242-2/+35
* | | | | | | | | | doc: don't claim that cherry calls patch-idMichael S. Tsirkin2013-09-241-2/+1
* | | | | | | | | | sample pre-commit hook: use --bool when retrieving config varJohan Herland2013-09-241-1/+1
* | | | | | | | | | clone: add a period after "done" to end the sentenceSebastian Schuberth2013-09-241-1/+1
* | | | | | | | | | Update draft release notes to 1.8.5 for the fifth batch of topicsJunio C Hamano2013-09-201-0/+60
* | | | | | | | | | Merge branch 'jk/upload-pack-keepalive'Junio C Hamano2013-09-202-1/+35
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | upload-pack: bump keepalive default to 5 secondsjk/upload-pack-keepaliveJeff King2013-09-092-2/+2
| * | | | | | | | | | upload-pack: send keepalive packets during pack computationJeff King2013-09-092-1/+35
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fc/at-head'Junio C Hamano2013-09-207-7/+54
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add new @ shortcut for HEADfc/at-headFelipe Contreras2013-09-125-0/+45
| * | | | | | | | | | sha1-name: pass len argument to interpret_branch_name()Felipe Contreras2013-09-034-7/+9
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dw/check-ignore-sans-index'Junio C Hamano2013-09-203-11/+74
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | check-ignore: Add option to ignore index contentsdw/check-ignore-sans-indexDave Williams2013-09-123-11/+74
* | | | | | | | | | | Merge branch 'mm/commit-template-squelch-advice-messages'Junio C Hamano2013-09-203-27/+37
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | commit: disable status hints when writing to COMMIT_EDITMSGmm/commit-template-squelch-advice-messagesMatthieu Moy2013-09-121-0/+6
| * | | | | | | | | | | wt-status: turn advice_status_hints into a field of wt_statusMatthieu Moy2013-09-123-19/+21
View Lorry Controller Status