summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Sync with 2.5.3Junio C Hamano2015-09-172-1/+19
|\
| * Git 2.5.3v2.5.3Junio C Hamano2015-09-174-3/+21
| * Merge branch 'dt/untracked-subdir' into maintJunio C Hamano2015-09-172-32/+282
| |\
| * \ Merge branch 'br/svn-doc-include-paths-config' into maintJunio C Hamano2015-09-171-0/+3
| |\ \
| * \ \ Merge branch 'ah/submodule-typofix-in-error' into maintJunio C Hamano2015-09-171-1/+1
| |\ \ \
| * \ \ \ Merge branch 'js/maint-am-skip-performance-regression' into maintJunio C Hamano2015-09-171-1/+1
| |\ \ \ \
* | \ \ \ \ Merge branch 'po/doc-branch-desc'Junio C Hamano2015-09-174-4/+7
|\ \ \ \ \ \
| * | | | | | doc: show usage of branch descriptionPhilip Oakley2015-09-144-4/+7
* | | | | | | Merge branch 'et/win32-poll-timeout'Junio C Hamano2015-09-171-2/+14
|\ \ \ \ \ \ \
| * | | | | | | poll: honor the timeout on Win32Edward Thomson2015-09-141-2/+14
* | | | | | | | Merge branch 'as/config-doc-markup-fix'Junio C Hamano2015-09-171-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/config: fix formatting for branch.*.rebase and pull.rebaseAndreas Schwab2015-09-131-6/+6
* | | | | | | | | Update RelNotes to 2.6 to describe leftover bits since -rc2Junio C Hamano2015-09-151-1/+7
* | | | | | | | | Merge branch 'js/maint-am-skip-performance-regression'Junio C Hamano2015-09-141-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexJohannes Schindelin2015-09-091-1/+1
* | | | | | | | | Merge branch 'ah/show-ref-usage-string'Junio C Hamano2015-09-141-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | show-ref: place angle brackets around variables in usage stringAlex Henrie2015-08-311-1/+1
* | | | | | | | | | Merge branch 'sg/help-group'Junio C Hamano2015-09-141-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Makefile: use SHELL_PATH when running generate-cmdlist.shAlejandro R. SedeƱo2015-09-111-1/+1
* | | | | | | | | | | Merge branch 'rt/help-strings-fix'Junio C Hamano2015-09-143-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | tag, update-ref: improve description of option "create-reflog"Ralf Thielow2015-09-112-2/+2
| * | | | | | | | | | | pull: don't mark values for option "rebase" for translationRalf Thielow2015-09-111-1/+1
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Git 2.6-rc2v2.6.0-rc2Junio C Hamano2015-09-142-1/+9
* | | | | | | | | | | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2015-09-1413-3515/+3749
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gitk: Accelerators for the main menuGiuseppe Bilotta2015-09-131-23/+23
| * | | | | | | | | | | gitk: Adjust the menu line numbers to compensate for the new entryBeat Bolli2015-09-131-3/+3
| * | | | | | | | | | | gitk: Add a "Copy commit summary" commandBeat Bolli2015-08-131-0/+15
| * | | | | | | | | | | gitk: Update Bulgarian translation (307t)Alexander Shopov2015-08-131-11/+8
| * | | | | | | | | | | gitk: Update .po filesPaul Mackerras2015-05-1712-3403/+3583
| * | | | | | | | | | | gitk: Update Bulgarian translation (304t)Alexander Shopov2015-05-171-9/+8
| * | | | | | | | | | | gitk: Use translated version of "Command line" in getcommitlinesMarc Branchaud2015-05-171-1/+1
| * | | | | | | | | | | gitk: Make it easier to go quickly to a specific commitIsmael Luceno2015-05-171-0/+2
| * | | | | | | | | | | gitk: Show the current view's name in the window titleMarc Branchaud2015-05-171-1/+16
| * | | | | | | | | | | gitk: Add mouse right-click options to copy path and branch nameMichael Rappazzo2015-05-171-0/+2
| * | | | | | | | | | | gitk: Remove mc parameter from proc show_errorAlex Henrie2015-05-171-23/+23
| * | | | | | | | | | | gitk: Fix error when changing colors after closing "List references" windowPaul Mackerras2015-05-031-5/+13
| * | | | | | | | | | | gitk: Replace catch {unset foo} with unset -nocomplain fooPaul Mackerras2015-05-021-56/+56
| * | | | | | | | | | | gitk: Rearrange window title to be more conventionalMarc Branchaud2015-04-061-1/+1
| * | | | | | | | | | | gitk: sv.po: Update Swedish translation (305t0f0u)Peter Krefting2015-04-061-7/+23
| * | | | | | | | | | | gitk: Fix bad English grammar "Matches none Commit Info"Alex Henrie2015-04-061-1/+1
* | | | | | | | | | | | Merge branch 'jk/pack-protocol-doc'Junio C Hamano2015-09-142-21/+30
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pack-protocol: clarify LF-handling in PKT-LINE()Jeff King2015-09-042-21/+30
* | | | | | | | | | | | | Merge branch 'mp/t7060-diff-index-test'Junio C Hamano2015-09-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t7060: actually test "git diff-index --cached -M"Matthieu Prat2015-09-021-1/+1
* | | | | | | | | | | | | | Merge branch 'gb/apply-comment-typofix'Junio C Hamano2015-09-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | apply: comment grammar fixGiuseppe Bilotta2015-09-091-1/+1
* | | | | | | | | | | | | | | Merge git://bogomips.org/git-svnJunio C Hamano2015-09-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-svn: parse authors file more lenientlyMichael J Gruber2015-09-101-1/+1
* | | | | | | | | | | | | | | | Sync with 2.5.2Junio C Hamano2015-09-099-28/+125
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Git 2.5.2v2.5.2Junio C Hamano2015-09-044-3/+67