summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-303-6/+12
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Fix bash completion in path with spacesDaniel Cheng (aka SDiZ)2009-03-301-2/+2
| | | * | | | | | bash completion: only show 'log --merge' if mergingThomas Rast2009-03-301-1/+6
| | | * | | | | | git-tag(1): add hint about commit messagesNico -telmich- Schottelius2009-03-301-0/+1
| | | * | | | | | Documentation: update graph api example.Allan Caffee2009-03-301-4/+4
* | | | | | | | | Documentation: push.default applies to all remotesSanti Béjar2009-03-301-9/+4
* | | | | | | | | Documentation: enhance branch.<name>.{remote,merge}Santi Béjar2009-03-301-2/+6
* | | | | | | | | Merge branch 'maint'Junio C Hamano2009-03-291-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-03-291-1/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-291-1/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | import-zips: fix thinkoJohannes Schindelin2009-03-291-1/+2
| * | | | | | | | git-svn: fix ls-tree usage with dash-prefixed pathsEric Wong2009-03-291-6/+9
* | | | | | | | | send-email: add tests for refactored promptingJay Soffian2009-03-291-4/+48
* | | | | | | | | send-email: refactor and ensure prompting doesn't loop foreverJay Soffian2009-03-291-32/+34
* | | | | | | | | git-svn: don't output git commits in quiet modeSimon Arlott2009-03-291-3/+3
* | | | | | | | | git-svn: fix ls-tree usage with dash-prefixed pathsEric Wong2009-03-281-6/+9
* | | | | | | | | 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