summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge branch 'hv/autosquash-config'Junio C Hamano2010-08-314-8/+47
|\ \ \ \ \
| * | | | | add configuration variable for --autosquash option of interactive rebaseHeiko Voigt2010-07-144-8/+47
* | | | | | Merge branch 'sg/rerere-gc-old-still-used'Junio C Hamano2010-08-314-11/+41
|\ \ \ \ \ \
| * | | | | | rerere: fix overeager gcSZEDER Gábor2010-07-143-9/+34
| * | | | | | mingw_utime(): handle NULL times parameterSZEDER Gábor2010-07-121-2/+7
* | | | | | | gitweb: Don't die_error in git_tag after already printing headersAnders Kaseorg2010-08-311-3/+3
* | | | | | | Merge branch 'maint'Junio C Hamano2010-08-291-5/+5
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'maint-1.7.1' into maintJunio C Hamano2010-08-291-5/+5
| |\ \ \ \ \ \ \
| | * | | | | | | t0003: add missing && at end of linesMatthieu Moy2010-08-291-5/+5
* | | | | | | | | object.h: Add OBJECT_ARRAY_INIT macro and make use of it.Thiago Farina2010-08-297-6/+8
* | | | | | | | | Merge branch 'maint'Junio C Hamano2010-08-264-11/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | for-each-ref: fix objectname:short bugJay Soffian2010-08-261-1/+2
| * | | | | | | | tree-walk: Correct bitrotted comment about tree_entry()Elijah Newren2010-08-251-1/+4
| * | | | | | | | Fix 'git log' early pager startup error caseLinus Torvalds2010-08-252-9/+4
* | | | | | | | | Merge branch 'maint'Junio C Hamano2010-08-242-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | parse-options: clarify PARSE_OPT_NOARG descriptionJonathan Nieder2010-08-241-1/+1
| * | | | | | | | t3302 (notes): Port to SolarisJonathan Nieder2010-08-241-1/+1
* | | | | | | | | t7610: cd inside subshell instead of aroundBrian Gernhardt2010-08-241-23/+26
* | | | | | | | | Merge branch 'maint'Junio C Hamano2010-08-2217-26/+26
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Typos in code comments, an error message, documentationRalf Wildenhues2010-08-2217-26/+26
* | | | | | | | | Typos in code comments, an error message, documentationRalf Wildenhues2010-08-222-2/+2
* | | | | | | | | Merge branch 'mm/rebase-i-exec'Junio C Hamano2010-08-217-11/+174
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-rebase--interactive.sh: use printf instead of echo to print commit messageBrandon Casey2010-08-131-2/+2
| * | | | | | | | | git-rebase--interactive.sh: rework skip_unnecessary_picksBrandon Casey2010-08-131-9/+14
| * | | | | | | | | test-lib: user-friendly alternatives to test [-d|-f|-e]Matthieu Moy2010-08-114-12/+51
| * | | | | | | | | rebase -i: add exec command to launch a shell commandMatthieu Moy2010-08-114-3/+122
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'gb/split-cmdline-errmsg'Junio C Hamano2010-08-214-4/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | split_cmdline: Allow caller to access error stringGreg Brockman2010-08-114-4/+18
| |/ / / / / / / /
* | | | | | | | | Merge branch 'so/http-user-agent'Junio C Hamano2010-08-213-2/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow HTTP user agent string to be modified.Spencer E. Olson2010-08-113-2/+18
| |/ / / / / / / /
* | | | | | | | | Merge branch 'mm/shortopt-detached'Junio C Hamano2010-08-217-80/+212
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | log: parse separate option for --globMatthieu Moy2010-08-062-2/+11
| * | | | | | | | | log: parse separate options like git log --grep fooMatthieu Moy2010-08-062-28/+53
| * | | | | | | | | diff: parse separate options --stat-width n, --stat-name-width nMatthieu Moy2010-08-061-5/+23
| * | | | | | | | | diff: split off a function for --stat-* option parsingJonathan Nieder2010-08-061-27/+35
| * | | | | | | | | diff: parse separate options like -S fooMatthieu Moy2010-08-065-23/+95
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sr/local-config'Junio C Hamano2010-08-211-2/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | config: add --local optionSverre Rabbelier2010-08-041-2/+5
| |/ / / / / / / /
* | | | | | | | | Merge branch 'nd/fix-sparse-checkout'Junio C Hamano2010-08-213-74/+108
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | unpack-trees: mark new entries skip-worktree appropriatelyNguyễn Thái Ngọc Duy2010-08-092-1/+3
| * | | | | | | | | unpack-trees: do not check for conflict entries too earlyNguyễn Thái Ngọc Duy2010-08-091-4/+1
| * | | | | | | | | unpack-trees: let read-tree -u remove index entries outside sparse areaNguyễn Thái Ngọc Duy2010-08-093-13/+30
| * | | | | | | | | unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always setNguyễn Thái Ngọc Duy2010-08-092-14/+24
| * | | | | | | | | t1011 (sparse checkout): style nitpicksJonathan Nieder2010-08-021-47/+55
* | | | | | | | | | Merge branch 'hv/submodule-find-ff-merge'Junio C Hamano2010-08-2110-55/+476
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Implement automatic fast-forward merge for submodulesHeiko Voigt2010-07-074-9/+291
| * | | | | | | | | | setup_revisions(): Allow walking history in a submoduleHeiko Voigt2010-07-074-14/+58
| * | | | | | | | | | Teach ref iteration module about submodulesHeiko Voigt2010-07-073-32/+127
* | | | | | | | | | | Merge branch 'en/rebase-against-rebase-fix'Junio C Hamano2010-08-212-0/+71
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesElijah Newren2010-08-122-2/+11