summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6Junio C Hamano2011-12-131-38/+49
|\
| * fetch: create status table using strbufjk/maint-fetch-status-tableJeff King2011-12-091-38/+49
* | Merge branch 'jc/maint-name-rev-all' into maint-1.7.6Junio C Hamano2011-12-131-1/+1
|\ \
| * | name-rev --all: do not even attempt to describe non-commit objectjc/maint-name-rev-allJunio C Hamano2011-11-151-1/+1
* | | Merge branch 'ml/mailmap' into maint-1.7.6Junio C Hamano2011-12-131-3/+2
|\ \ \
| * | | mailmap: xcalloc mailmap_infoml/mailmapMarc-André Lureau2011-11-161-3/+2
* | | | blame: don't overflow time bufferJeff King2011-12-131-1/+1
* | | | stripspace: fix outdated commentJeff King2011-12-051-2/+0
* | | | Add MYMETA.yml to perl/.gitignoreSebastian Morr2011-12-051-0/+1
* | | | Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6Junio C Hamano2011-10-261-1/+2
|\ \ \ \
| * | | | notes_merge_commit(): do not pass temporary buffer to other functionMichael Haggerty2011-09-271-1/+2
* | | | | Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6Junio C Hamano2011-10-261-4/+4
|\ \ \ \ \
| * | | | | gitweb: Fix links to lines in blobs when javascript-actions are enabledPeter Stuge2011-09-271-4/+4
* | | | | | Merge branch 'jm/mergetool-pathspec' into maint-1.7.6Junio C Hamano2011-10-263-70/+71
|\ \ \ \ \ \
| * | | | | | mergetool: no longer need to save standard inputJunio C Hamano2011-09-261-6/+4
| * | | | | | mergetool: Use args as pathspec to unmerged filesJonathon Mah2011-09-263-69/+72
* | | | | | | Merge branch 'mz/remote-rename' into maint-1.7.6Junio C Hamano2011-10-262-7/+52
|\ \ \ \ \ \ \
| * | | | | | | remote: only update remote-tracking branch if updating refspecMartin von Zweigbergk2011-09-112-4/+9
| * | | | | | | remote rename: warn when refspec was not updatedMartin von Zweigbergk2011-09-111-0/+6
| * | | | | | | remote: "rename o foo" should not rename ref "origin/bar"Martin von Zweigbergk2011-09-112-1/+11
| * | | | | | | remote: write correct fetch spec when renaming remote 'remote'Martin von Zweigbergk2011-09-112-4/+28
* | | | | | | | Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6Junio C Hamano2011-10-261-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | t9159-*.sh: skip for mergeinfo test for svn <= 1.4Ramsay Jones2011-09-211-0/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6Junio C Hamano2011-10-262-11/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | date.c: Support iso8601 timezone formatsHaitao Li2011-09-122-11/+29
* | | | | | | | | Merge branch 'tr/doc-note-rewrite' into maint-1.7.6Junio C Hamano2011-10-261-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: basic configuration of notes.rewriteRefThomas Rast2011-09-131-1/+2
* | | | | | | | | | Merge branch 'nd/sparse-doc' into maint-1.7.6Junio C Hamano2011-10-261-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-read-tree.txt: update sparse checkout examplesNguyễn Thái Ngọc Duy2011-09-261-2/+2
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mg/maint-doc-sparse-checkout' into maint-1.7.6Junio C Hamano2011-10-264-25/+31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-read-tree.txt: correct sparse-checkout and skip-worktree descriptionMichael J Gruber2011-09-211-4/+4
| * | | | | | | | | | git-read-tree.txt: language and typography fixesMichael J Gruber2011-09-211-20/+20
| * | | | | | | | | | unpack-trees: print "Aborting" to stderrMichael J Gruber2011-09-213-1/+7
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'maint-1.7.5' into maint-1.7.6Junio C Hamano2011-10-263-5/+12
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'maint-1.7.4' into maint-1.7.5Junio C Hamano2011-10-263-5/+12
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'maint-1.7.3' into maint-1.7.4Junio C Hamano2011-10-263-5/+12
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3Junio C Hamano2011-10-261-2/+5
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Documentation/git-update-index: refer to 'ls-files'Stefan Naewe2011-09-211-2/+5
| | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | | * | | | | | | | make the sample pre-commit hook script reject names with newlines, tooJim Meyering2011-10-261-2/+6
| | | * | | | | | | | Reindent closing bracket using tab instead of spacesNguyễn Thái Ngọc Duy2011-10-231-1/+1
* | | | | | | | | | | Git 1.7.6.4v1.7.6.4Junio C Hamano2011-09-234-3/+36
* | | | | | | | | | | Merge branch 'cb/maint-ls-files-error-report' into maintJunio C Hamano2011-09-236-10/+90
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t3005: do not assume a particular order of stdout and stderr of git-ls-filesJohannes Sixt2011-08-281-10/+12
| * | | | | | | | | | | ls-files: fix pathspec display on errorClemens Buchacher2011-08-116-10/+88
* | | | | | | | | | | | describe: Refresh the index when run with --dirtyAllan Caffee2011-09-231-2/+15
* | | | | | | | | | | | Merge branch 'jc/maint-clone-alternates' into maintJunio C Hamano2011-09-233-30/+114
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | clone: clone from a repository with relative alternatesJunio C Hamano2011-08-233-25/+78
| * | | | | | | | | | | | clone: allow more than one --referenceJunio C Hamano2011-08-222-8/+39
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'nd/maint-clone-gitdir' into maintJunio C Hamano2011-09-239-12/+33
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | clone: allow to clone from .git fileNguyễn Thái Ngọc Duy2011-08-222-1/+22