summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'hv/remote-end-hung-up'Junio C Hamano2012-07-044-16/+51
|\
| * remove the impression of unexpectedness when access is deniedHeiko Voigt2012-06-194-16/+51
* | Fix formatting in git-config(1)Andreas Schwab2012-07-031-7/+9
* | Sync with i18n-po updates in maintJunio C Hamano2012-07-021-562/+2270
|\ \
| * \ Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2012-07-021-562/+2270
| |\ \
| | * | Update Swedish translation (1066t0f0u)Peter Krefting2012-07-011-562/+2270
* | | | Third batch for 1.7.12Junio C Hamano2012-06-281-0/+43
* | | | Merge branch 'fc/git-prompt-script'Junio C Hamano2012-06-285-268/+771
|\ \ \ \
| * | | | completion: respect $GIT_DIRSZEDER Gábor2012-06-192-1/+12
| * | | | completion: warn people about duplicated functionJunio C Hamano2012-06-102-0/+4
| * | | | completion: split __git_ps1 into a separate scriptFelipe Contreras2012-05-223-256/+290
| * | | | completion: remove executable modeFelipe Contreras2012-05-221-0/+0
| * | | | Merge branch 'fc/git-complete-helper' into fc/git-prompt-scriptJunio C Hamano2012-05-2239-527/+1084
| |\ \ \ \
| * | | | | tests: add tests for the bash prompt functions in the completion scriptSZEDER Gábor2012-05-091-0/+448
| * | | | | tests: move code to run tests under bash into a helper librarySZEDER Gábor2012-05-092-13/+19
* | | | | | Merge branch 'js/submodule-relative'Junio C Hamano2012-06-283-10/+289
|\ \ \ \ \ \
| * | | | | | t7400: avoid path mangling issuesJohannes Sixt2012-06-141-3/+8
| * | | | | | submodule: fix handling of superproject origin URLs like foo, ./foo and ./foo...Jon Seymour2012-06-063-8/+18
| * | | | | | submodule: fix sync handling of some relative superproject origin URLsJon Seymour2012-06-062-9/+47
| * | | | | | submodule: document failure to handle relative superproject origin URLsJon Seymour2012-06-032-1/+123
| * | | | | | submodule: additional regression tests for relative URLsJon Seymour2012-06-031-3/+107
* | | | | | | Merge branch 'lk/more-helpful-status-hints'Junio C Hamano2012-06-285-4/+1004
|\ \ \ \ \ \ \
| * | | | | | | status: better advices when splitting a commit (during rebase -i)Lucien Kong2012-06-142-0/+329
| * | | | | | | status: don't suggest "git rm" or "git add" if not appropriateLucien Kong2012-06-143-7/+74
| * | | | | | | t7512-status-help.sh: better advices for git statusLucien Kong2012-06-141-0/+372
| * | | | | | | wt-status.*: better advices for git status addedLucien Kong2012-06-144-3/+235
* | | | | | | | Merge branch 'lk/rebase-i-x'Junio C Hamano2012-06-284-6/+199
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase -i: teach "--exec <cmd>"Lucien Kong2012-06-134-6/+199
* | | | | | | | | Merge branch 'jc/rev-list-simplify-merges-first-parent'Junio C Hamano2012-06-281-12/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | revision: ignore side parents while running simplify-mergesJunio C Hamano2012-06-131-3/+11
| * | | | | | | | | revision: note the lack of free() in simplify_merges()Junio C Hamano2012-06-081-7/+16
| * | | | | | | | | revision: "simplify" options imply topo-order sortJunio C Hamano2012-06-081-2/+2
* | | | | | | | | | Merge branch 'hv/submodule-update-nuke-submodules'Junio C Hamano2012-06-281-6/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | update-index: allow overwriting existing submodule index entriesHeiko Voigt2012-06-111-6/+0
* | | | | | | | | | | Merge branch 'nd/exclude-workaround-top-heavy'Junio C Hamano2012-06-282-67/+78
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | exclude: do strcmp as much as possible before fnmatchNguyễn Thái Ngọc Duy2012-06-072-14/+25
| * | | | | | | | | | | dir.c: get rid of the wildcard symbol set in no_wildcard()Nguyễn Thái Ngọc Duy2012-06-071-16/+16
| * | | | | | | | | | | Unindent excluded_from_list()Nguyễn Thái Ngọc Duy2012-05-291-48/+48
* | | | | | | | | | | | Merge branch 'nd/stream-pack-objects'Junio C Hamano2012-06-282-6/+79
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pack-objects: use streaming interface for reading large loose blobsNguyễn Thái Ngọc Duy2012-05-292-6/+79
* | | | | | | | | | | | | Merge branch 'nd/stream-index-pack'Junio C Hamano2012-06-283-23/+181
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | index-pack: use streaming interface for collision test on large blobsNguyễn Thái Ngọc Duy2012-05-242-5/+82
| * | | | | | | | | | | | | index-pack: factor out unpack core from get_data_from_packNguyễn Thái Ngọc Duy2012-05-231-3/+24
| * | | | | | | | | | | | | index-pack: use streaming interface on large blobs (most of the time)Nguyễn Thái Ngọc Duy2012-05-232-8/+49
| * | | | | | | | | | | | | index-pack: hash non-delta objects while reading from streamNguyễn Thái Ngọc Duy2012-05-231-11/+30
* | | | | | | | | | | | | | Merge branch 'mm/verify-filename-fix'Junio C Hamano2012-06-288-10/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | verify_filename(): ask the caller to chose the kind of diagnosisMatthieu Moy2012-06-187-10/+33
| * | | | | | | | | | | | | | sha1_name: do not trigger detailed diagnosis for file argumentsMatthieu Moy2012-06-182-1/+12
* | | | | | | | | | | | | | | Merge branch 'jk/diff-no-index-pager'Junio C Hamano2012-06-283-15/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | do not run pager with diff --no-index --quietJeff King2012-06-151-3/+3
View Lorry Controller Status