summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge-tree: fix typo in "both changed identically"John Keeping2013-04-282-1/+14
* merge-tree: don't print entries that match "local"John Keeping2013-04-082-23/+13
* merge-tree: fix typo in merge-tree.c::unresolvedJohn Keeping2013-03-271-1/+1
* git-commit doc: describe use of multiple `-m` optionsChristian Helmuth2013-03-271-0/+2
* git-pull doc: fix grammo ("conflicts" is plural)Mihai Capotă2013-03-271-1/+1
* Correct the docs about GIT_SSH.Dan Bornstein2013-03-261-3/+6
* Merge branch 'lf/bundle-verify-list-prereqs' into maint-1.8.1Junio C Hamano2013-03-251-5/+5
|\
| * bundle: Add colons to list headings in "verify"Lukas Fleischer2013-03-081-4/+4
| * bundle: Fix "verify" output if history is completeLukas Fleischer2013-03-071-1/+1
* | Merge branch 'tk/doc-filter-branch' into maint-1.8.1Junio C Hamano2013-03-251-2/+25
|\ \
| * | Documentation: filter-branch env-filter exampleTadeusz Andrzej Kadłubowski2013-02-261-0/+20
| * | git-filter-branch.txt: clarify ident variables usageTadeusz Andrzej Kadłubowski2013-02-261-2/+5
* | | Merge branch 'dm/ni-maxhost-may-be-missing' into maint-1.8.1Junio C Hamano2013-03-252-4/+11
|\ \ \
| * | | git-compat-util.h: Provide missing netdb.h definitionsDavid Michael2013-02-252-4/+11
| | |/ | |/|
* | | Merge branch 'gp/describe-match-uses-glob-pattern' into maint-1.8.1Junio C Hamano2013-03-251-2/+3
|\ \ \
| * | | describe: Document --match pattern formatGreg Price2013-02-241-2/+3
* | | | Merge branch 'nd/doc-index-format' into maint-1.8.1Junio C Hamano2013-03-253-5/+13
|\ \ \ \
| * | | | update-index: list supported idx versions and their featuresNguyễn Thái Ngọc Duy2013-02-231-1/+9
| * | | | read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr()Nguyễn Thái Ngọc Duy2013-02-221-1/+1
| * | | | index-format.txt: mention of v4 is missing in some placesNguyễn Thái Ngọc Duy2013-02-221-3/+3
| |/ / /
* | | | Merge branch 'wk/doc-pre-rebase' into maint-1.8.1Junio C Hamano2013-03-251-3/+5
|\ \ \ \
| * | | | Documentation/githooks: Explain pre-rebase parametersW. Trevor King2013-02-241-3/+5
| |/ / /
* | | | Merge branch 'jc/color-diff-doc' into maint-1.8.1Junio C Hamano2013-03-251-2/+2
|\ \ \ \
| * | | | diff-options: unconfuse description of --colorJunio C Hamano2013-02-221-2/+2
| | |/ / | |/| |
* | | | t1507: Test that branchname@{upstream} is interpreted as branchKacper Kornet2013-03-171-0/+4
* | | | rev-parse: clarify documentation of $name@{upstream} syntaxKacper Kornet2013-03-171-4/+4
* | | | sha1_name: pass object name length to diagnose_invalid_sha1_path()René Scharfe2013-03-171-18/+14
* | | | Makefile: keep LIB_H entries together and sortedRené Scharfe2013-03-161-16/+13
* | | | git.c: make usage match manual pageKevin Bracey2013-03-111-2/+2
* | | | Translate git_more_info_string consistentlyKevin Bracey2013-03-101-1/+1
* | | | perf: update documentation of GIT_PERF_REPEAT_COUNTAntoine Pelisse2013-03-091-1/+1
* | | | Merge branch 'mh/maint-ceil-absolute' into maintJunio C Hamano2013-03-073-16/+52
|\ \ \ \
| * | | | Provide a mechanism to turn off symlink resolution in ceiling pathsMichael Haggerty2013-02-223-16/+52
* | | | | gitweb/README: remove reference to git.kernel.orgFredrik Gustafsson2013-03-071-3/+0
* | | | | Git 1.8.1.5v1.8.1.5Junio C Hamano2013-03-013-2/+9
* | | | | Make !pattern in .gitattributes non-fatalThomas Rast2013-03-012-4/+7
* | | | | Merge branch 'wk/user-manual' into maintJunio C Hamano2013-03-011-56/+77
|\ \ \ \ \
| * | | | | user-manual: Flesh out uncommitted changes and submodule updatesW. Trevor King2013-02-191-1/+3
| * | | | | user-manual: Use request-pull to generate "please pull" textW. Trevor King2013-02-191-9/+5
| * | | | | user-manual: Reorganize the reroll sections, adding 'git rebase -i'W. Trevor King2013-02-191-46/+69
* | | | | | Documentation/githooks: Fix linkgitAndrew Wong2013-03-011-1/+1
* | | | | | Update draft release notes to 1.8.1.5Junio C Hamano2013-02-271-1/+5
* | | | | | Merge branch 'ef/non-ascii-parse-options-error-diag' into maintJunio C Hamano2013-02-271-1/+4
|\ \ \ \ \ \
| * | | | | | parse-options: report uncorrupted multi-byte optionsErik Faye-Lund2013-02-111-1/+4
* | | | | | | Merge branch 'wk/man-deny-current-branch-is-default-these-days' into maintJunio C Hamano2013-02-271-3/+4
|\ \ \ \ \ \ \
| * | | | | | | user-manual: typofix (ofthe->of the)Junio C Hamano2013-02-181-1/+1
| * | | | | | | user-manual: Update for receive.denyCurrentBranch=refuseW. Trevor King2013-02-141-3/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jn/less-reconfigure' into maintJunio C Hamano2013-02-271-6/+8
|\ \ \ \ \ \ \
| * | | | | | | Makefile: avoid infinite loop on configure.ac changeJeff King2013-02-201-6/+8
* | | | | | | | Documentation/submodule: Add --force to update synopsisBrad King2013-02-271-1/+1
View Lorry Controller Status