summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Documentation: move callouts.xsl to manpage-{base,normal}.xslChris Johnsen2009-03-273-1/+31
* Merge branch 'maint'Junio C Hamano2009-03-261-1/+1
|\
| * documentation: update cvsimport description of "-r" for recent cloneCarlo Marcelo Arenas Belon2009-03-261-1/+1
* | Merge branch 'db/push-cleanup'Junio C Hamano2009-03-267-107/+356
|\ \
| * | Move push matching and reporting logic into transport.cDaniel Barkalow2009-03-094-92/+343
| * | Use a common function to get the pretty name of refsDaniel Barkalow2009-03-094-15/+13
* | | Merge branch 'jc/maint-1.6.0-blame-s'Junio C Hamano2009-03-261-4/+4
|\ \ \
| * | | blame: read custom grafts given by -S before calling setup_revisions()Junio C Hamano2009-03-181-4/+4
* | | | Merge branch 'mg/http-auth'Junio C Hamano2009-03-262-141/+190
|\ \ \ \
| * | | | http-push.c: use a faux remote to pass to http_initAmos King2009-03-191-1/+9
| * | | | Do not name "repo" struct "remote" in push_http.cAmos King2009-03-191-76/+76
| * | | | http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient versions of cURLJunio C Hamano2009-03-121-3/+1
| * | | | http authentication via promptsJunio C Hamano2009-03-101-0/+60
| * | | | http_init(): Fix config file parsingJunio C Hamano2009-03-101-42/+27
| * | | | http.c: style cleanupsJunio C Hamano2009-03-091-23/+21
* | | | | Merge branch 'jk/reflog-date'Junio C Hamano2009-03-263-6/+78
|\ \ \ \ \
| * | | | | make oneline reflog dates more consistent with multiline formatJeff King2009-03-203-6/+78
* | | | | | Merge branch 'jc/attributes-checkout'Junio C Hamano2009-03-264-18/+95
|\ \ \ \ \ \
| * | | | | | Add a test for checking whether gitattributes is honored by checkout.Kristian Amlie2009-03-201-0/+31
| * | | | | | Read attributes from the index that is being checked outJunio C Hamano2009-03-133-18/+64
* | | | | | | Merge branch 'js/maint-diff-temp-smudge'Junio C Hamano2009-03-262-3/+26
|\ \ \ \ \ \ \
| * | | | | | | Smudge the files fed to external diff and textconvJohannes Schindelin2009-03-222-3/+26
* | | | | | | | Merge branch 'js/maint-1.6.0-exec-path-env'Junio C Hamano2009-03-261-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Propagate --exec-path setting to external commands via GIT_EXEC_PATHJohannes Sixt2009-03-211-0/+4
* | | | | | | | | Merge branch 'bc/maint-1.6.1-branch-deleted-was'Junio C Hamano2009-03-262-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-branch: display "was sha1" on branch deletion rather than just "sha1"Brandon Casey2009-03-212-2/+2
* | | | | | | | | | Merge branch 'fg/push-default'Junio C Hamano2009-03-266-5/+134
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin-push.c: Fix typo: "anythig" -> "anything"Kevin Ballard2009-03-251-1/+1
| * | | | | | | | | | Display warning for default git push with no push.default configFinn Arne Gangstad2009-03-172-0/+30
| * | | | | | | | | | New config push.default to decide default behavior for pushFinn Arne Gangstad2009-03-175-5/+104
* | | | | | | | | | | Merge branch 'dm/maint-docco'Junio C Hamano2009-03-265-91/+91
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation: Remove spurious uses of "you" in git-bisect.txt.David J. Mellor2009-03-251-3/+3
| * | | | | | | | | | | Documentation: minor grammatical fix in git-check-ref-format.txtDavid J. Mellor2009-03-221-20/+20
| * | | | | | | | | | | Documentation: minor grammatical fixes in git-check-attr.txtDavid J. Mellor2009-03-221-8/+8
| * | | | | | | | | | | Documentation: minor grammatical fixes in git-cat-file.txtDavid J. Mellor2009-03-221-9/+9
| * | | | | | | | | | | Documentation: minor grammatical fixes and rewording in git-bundle.txtDavid J. Mellor2009-03-221-43/+43
| * | | | | | | | | | | Documentation: remove some uses of the passive voice in git-bisect.txtDavid J. Mellor2009-03-221-11/+11
* | | | | | | | | | | | fast-export: Avoid dropping files from commitsElijah Newren2009-03-252-3/+7
* | | | | | | | | | | | Grammar fixes to "merge" and "patch-id" docsWincent Colaiuta2009-03-253-9/+9
* | | | | | | | | | | | Correct missing SP characters in grammar comment at top of fast-import.cElijah Newren2009-03-251-3/+4
* | | | | | | | | | | | git-filter-branch: avoid collisions with variables in eval'ed commandsElijah Newren2009-03-251-3/+3
* | | | | | | | | | | | Merge branch 'for-junio' of git://repo.or.cz/git/mingw/j6tJunio C Hamano2009-03-253-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t7502-commit: Skip SIGTERM test on WindowsJohannes Sixt2009-03-252-1/+3
| * | | | | | | | | | | | t7005-editor: Use $SHELL_PATH in the editor scriptsJohannes Sixt2009-03-251-0/+1
* | | | | | | | | | | | | Guard a few Makefile variables against user environmentsJohannes Schindelin2009-03-251-0/+12
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-03-243-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Increase the size of the die/warning buffer to avoid truncationShawn O. Pearce2009-03-241-1/+1
| * | | | | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-03-242-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-242-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | close_sha1_file(): make it easier to diagnose errorsLinus Torvalds2009-03-241-1/+1