summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2009-03-283-11/+3
|\
| * Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-03-283-11/+3
| |\
| | * test-lib: Clean up comments and Makefile.Emil Sit2009-03-282-9/+1
| | * diff --no-index: Do not generate patch output if other output is requestedJohannes Sixt2009-03-251-2/+2
* | | Update draft release notes to 1.6.3Junio C Hamano2009-03-281-7/+21
* | | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'Junio C Hamano2009-03-282-1/+17
|\ \ \
| * | | diff --cached: do not borrow from a work tree when a path is marked as assume...Junio C Hamano2009-03-222-1/+17
* | | | Merge branch 'js/remote-improvements'Junio C Hamano2009-03-281-1/+16
|\ \ \ \
| * | | | remote: improve sorting of "configure for git push" listJeff King2009-03-221-1/+16
* | | | | Merge branch 'jk/clone-post-checkout'Junio C Hamano2009-03-281-0/+4
|\ \ \ \ \
| * | | | | githooks documentation: post-checkout hook is also called after cloneJens Lehmann2009-03-221-0/+4
* | | | | | rebase: fix typo (force_rebas -> force-rebas)Michele Ballabio2009-03-271-1/+1
* | | | | | Merge branch 'db/push-cleanup'Junio C Hamano2009-03-261-2/+1
|\ \ \ \ \ \
| * | | | | | builtin-send-pack.c: avoid empty structure initializationBrandon Casey2009-03-261-2/+1
* | | | | | | Grammar fix for "git merge" man pageWincent Colaiuta2009-03-261-1/+1
* | | | | | | 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
View Lorry Controller Status