summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint-1.7.6' into maintJunio C Hamano2011-10-2610-93/+166
|\
| * 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 'maint-1.7.6' into maintJunio C Hamano2011-10-267-32/+46
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
* | | | | | | | | | | Merge branch 'maint-1.7.3' into maintJunio C Hamano2011-10-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Reindent closing bracket using tab instead of spacesNguyễn Thái Ngọc Duy2011-10-231-1/+1
* | | | | | | | | | | Git 1.7.7.1v1.7.7.1Junio C Hamano2011-10-232-2/+3
* | | | | | | | | | | RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile se...Jonathan Nieder2011-10-231-2/+3
* | | | | | | | | | | Almost ready for 1.7.7.1Junio C Hamano2011-10-211-0/+20
* | | | | | | | | | | Merge branch 'nd/maint-autofix-tag-in-head' into maintJunio C Hamano2011-10-217-65/+93
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Accept tags in HEAD or MERGE_HEADNguyễn Thái Ngọc Duy2011-09-187-14/+34
| * | | | | | | | | | | merge: remove global variable head[]Nguyễn Thái Ngọc Duy2011-09-181-44/+53
| * | | | | | | | | | | merge: use return value of resolve_ref() to determine if HEAD is invalidNguyễn Thái Ngọc Duy2011-09-181-1/+1
| * | | | | | | | | | | merge: keep stash[] a local variableNguyễn Thái Ngọc Duy2011-08-261-17/+16
* | | | | | | | | | | | Merge branch 'jc/apply-blank-at-eof-fix' into maintJunio C Hamano2011-10-211-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | apply --whitespace=error: correctly report new blank lines at endJunio C Hamano2011-09-261-2/+9
* | | | | | | | | | | | | Merge branch 'jn/no-g-plus-s-on-bsd' into maintJunio C Hamano2011-10-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Makefile: do not set setgid bit on directories on GNU/kFreeBSDJonathan Nieder2011-10-031-0/+1
* | | | | | | | | | | | | | Merge branch 'rs/diff-cleanup-records-fix' into maintJunio C Hamano2011-10-213-3/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | diff: resurrect XDF_NEED_MINIMAL with --minimalJunio C Hamano2011-10-032-0/+8
| * | | | | | | | | | | | | | Revert removal of multi-match discard heuristic in 27af01René Scharfe2011-09-261-3/+7
* | | | | | | | | | | | | | | Merge branch 'il/archive-err-signal' into maintJunio C Hamano2011-10-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status