summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.7.7-rc0v1.7.7-rc0Junio C Hamano2011-08-252-3/+10
* Merge branch 'jc/merge-reword'Junio C Hamano2011-08-252-4/+4
|\
| * merge: reword the final messageJunio C Hamano2011-05-252-4/+4
* | Merge branch 'mg/branch-set-upstream-previous'Junio C Hamano2011-08-252-1/+15
|\ \
| * | branch.c: use the parsed branch nameMichael J Gruber2011-08-192-1/+15
* | | Merge branch 'da/difftool-mergtool-refactor'Junio C Hamano2011-08-2518-320/+432
|\ \ \
| * | | mergetools/meld: Use '--output' when availableDavid Aguilar2011-08-191-1/+24
| * | | mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-1917-333/+369
| * | | mergetool--lib: Make style consistent with gitDavid Aguilar2011-08-191-53/+100
| * | | difftool--helper: Make style consistent with gitDavid Aguilar2011-08-191-6/+12
* | | | Merge branch 'jc/maint-autofix-tag-in-head'Junio C Hamano2011-08-251-42/+45
|\ \ \ \
| * | | | commit: reduce use of redundant global variablesJunio C Hamano2011-08-191-42/+45
* | | | | Merge branch 'di/fast-import-doc'Junio C Hamano2011-08-252-3/+54
|\ \ \ \ \
| * | | | | doc/fast-import: document feature import-marks-if-existsDmitry Ivankov2011-08-172-3/+54
* | | | | | Merge branch 'jn/plug-empty-tree-leak'Junio C Hamano2011-08-253-12/+30
|\ \ \ \ \ \
| * | | | | | merge-recursive: take advantage of hardcoded empty treeJonathan Nieder2011-08-161-5/+3
| * | | | | | revert: plug memory leak in "cherry-pick root commit" codepathJonathan Nieder2011-08-162-7/+27
* | | | | | | Merge branch 'ac/describe-dirty-refresh'Junio C Hamano2011-08-251-2/+15
|\ \ \ \ \ \ \
| * | | | | | | describe: Refresh the index when run with --dirtyAllan Caffee2011-08-111-2/+15
* | | | | | | | Merge branch 'di/parse-options-split'Junio C Hamano2011-08-256-152/+159
|\ \ \ \ \ \ \ \
| * | | | | | | | Reduce parse-options.o dependenciesDmitry Ivankov2011-08-115-150/+155
| * | | | | | | | parse-options: export opterr, optbugDmitry Ivankov2011-08-112-2/+4
* | | | | | | | | Merge branch 'js/i18n-scripts'Junio C Hamano2011-08-255-40/+44
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule: take advantage of gettextln and eval_gettextln.Jon Seymour2011-08-081-12/+6
| * | | | | | | | | stash: take advantage of eval_gettextlnJon Seymour2011-08-081-6/+3
| * | | | | | | | | pull: take advantage of eval_gettextlnJon Seymour2011-08-081-5/+2
| * | | | | | | | | git-am: take advantage of gettextln and eval_gettextln.Jon Seymour2011-08-081-17/+14
| * | | | | | | | | gettext: add gettextln, eval_gettextln to encode common idiomJon Seymour2011-08-081-0/+19
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-08-255-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | whitespace: have SP on both sides of an assignment "="Junio C Hamano2011-08-254-4/+4
| * | | | | | | | | | update-ref: whitespace fixPang Yan Han2011-08-251-1/+1
* | | | | | | | | | | Sync with 1.7.6.1Junio C Hamano2011-08-242-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Git 1.7.6.1v1.7.6.1Junio C Hamano2011-08-242-2/+3
| * | | | | | | | | | Merge branch 'jc/maint-smart-http-race-upload-pack' into maintJunio C Hamano2011-08-241-0/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | get_indexed_object can return NULL if nothing is in that slot; check for itBrian Harring2011-08-241-0/+2
* | | | | | | | | | | | Update draft release notes to 1.7.7Junio C Hamano2011-08-231-15/+9
* | | | | | | | | | | | Merge branch 'rt/zlib-smaller-window'Junio C Hamano2011-08-2323-13/+99
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | test: consolidate definition of $LFJunio C Hamano2011-08-115-9/+4
| * | | | | | | | | | | | Tolerate zlib deflation with window size < 32KbRoberto Tyley2011-08-1119-6/+97
* | | | | | | | | | | | | Merge branch 'jn/maint-test-return'Junio C Hamano2011-08-232-9/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t3900: do not reference numbered arguments from the test scriptJohannes Sixt2011-08-111-2/+2
| * | | | | | | | | | | | | test: cope better with use of return for errorsJonathan Nieder2011-08-081-2/+8
| * | | | | | | | | | | | | test: simplify return value of test_run_Jonathan Nieder2011-08-081-5/+3
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'cb/maint-ls-files-error-report'Junio C Hamano2011-08-236-10/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | ls-files: fix pathspec display on errorClemens Buchacher2011-08-116-10/+88
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-08-231-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Update draft release notes for 1.7.6.1Junio C Hamano2011-08-231-0/+11
| * | | | | | | | | | | | | Merge branch 'jc/maint-combined-diff-work-tree' into maintJunio C Hamano2011-08-231-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-exec-error-report' into maintJunio C Hamano2011-08-233-17/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-quiet-push' into maintJunio C Hamano2011-08-236-10/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \