Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-03-30 | 3 | -6/+12 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | ||||||
| | | * | | | | | | Fix bash completion in path with spaces | Daniel Cheng (aka SDiZ) | 2009-03-30 | 1 | -2/+2 | |
| | | * | | | | | | bash completion: only show 'log --merge' if merging | Thomas Rast | 2009-03-30 | 1 | -1/+6 | |
| | | * | | | | | | git-tag(1): add hint about commit messages | Nico -telmich- Schottelius | 2009-03-30 | 1 | -0/+1 | |
| | | * | | | | | | Documentation: update graph api example. | Allan Caffee | 2009-03-30 | 1 | -4/+4 | |
* | | | | | | | | | Documentation: push.default applies to all remotes | Santi Béjar | 2009-03-30 | 1 | -9/+4 | |
* | | | | | | | | | Documentation: enhance branch.<name>.{remote,merge} | Santi Béjar | 2009-03-30 | 1 | -2/+6 | |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-03-29 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-03-29 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-03-29 | 1 | -1/+2 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | ||||||
| | | * | | | | | | import-zips: fix thinko | Johannes Schindelin | 2009-03-29 | 1 | -1/+2 | |
| * | | | | | | | | git-svn: fix ls-tree usage with dash-prefixed paths | Eric Wong | 2009-03-29 | 1 | -6/+9 | |
* | | | | | | | | | send-email: add tests for refactored prompting | Jay Soffian | 2009-03-29 | 1 | -4/+48 | |
* | | | | | | | | | send-email: refactor and ensure prompting doesn't loop forever | Jay Soffian | 2009-03-29 | 1 | -32/+34 | |
* | | | | | | | | | git-svn: don't output git commits in quiet mode | Simon Arlott | 2009-03-29 | 1 | -3/+3 | |
* | | | | | | | | | git-svn: fix ls-tree usage with dash-prefixed paths | Eric Wong | 2009-03-28 | 1 | -6/+9 | |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-03-28 | 3 | -11/+3 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-03-28 | 3 | -11/+3 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | test-lib: Clean up comments and Makefile. | Emil Sit | 2009-03-28 | 2 | -9/+1 | |
| | | |_|_|_|/ / | | |/| | | | | | ||||||
| | * | | | | | | diff --no-index: Do not generate patch output if other output is requested | Johannes Sixt | 2009-03-25 | 1 | -2/+2 | |
* | | | | | | | | Update draft release notes to 1.6.3 | Junio C Hamano | 2009-03-28 | 1 | -7/+21 | |
* | | | | | | | | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' | Junio C Hamano | 2009-03-28 | 2 | -1/+17 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | diff --cached: do not borrow from a work tree when a path is marked as assume... | Junio C Hamano | 2009-03-22 | 2 | -1/+17 | |
* | | | | | | | | | Merge branch 'js/remote-improvements' | Junio C Hamano | 2009-03-28 | 1 | -1/+16 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | remote: improve sorting of "configure for git push" list | Jeff King | 2009-03-22 | 1 | -1/+16 | |
* | | | | | | | | | | Merge branch 'jk/clone-post-checkout' | Junio C Hamano | 2009-03-28 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | githooks documentation: post-checkout hook is also called after clone | Jens Lehmann | 2009-03-22 | 1 | -0/+4 | |
* | | | | | | | | | | | rebase: fix typo (force_rebas -> force-rebas) | Michele Ballabio | 2009-03-27 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge branch 'db/push-cleanup' | Junio C Hamano | 2009-03-26 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | builtin-send-pack.c: avoid empty structure initialization | Brandon Casey | 2009-03-26 | 1 | -2/+1 | |
* | | | | | | | | | | | | Grammar fix for "git merge" man page | Wincent Colaiuta | 2009-03-26 | 1 | -1/+1 | |
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-03-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | documentation: update cvsimport description of "-r" for recent clone | Carlo Marcelo Arenas Belon | 2009-03-26 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge branch 'db/push-cleanup' | Junio C Hamano | 2009-03-26 | 7 | -107/+356 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Move push matching and reporting logic into transport.c | Daniel Barkalow | 2009-03-09 | 4 | -92/+343 | |
| * | | | | | | | | | | Use a common function to get the pretty name of refs | Daniel Barkalow | 2009-03-09 | 4 | -15/+13 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'jc/maint-1.6.0-blame-s' | Junio C Hamano | 2009-03-26 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | blame: read custom grafts given by -S before calling setup_revisions() | Junio C Hamano | 2009-03-18 | 1 | -4/+4 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'mg/http-auth' | Junio C Hamano | 2009-03-26 | 2 | -141/+190 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | http-push.c: use a faux remote to pass to http_init | Amos King | 2009-03-19 | 1 | -1/+9 | |
| * | | | | | | | | | | Do not name "repo" struct "remote" in push_http.c | Amos King | 2009-03-19 | 1 | -76/+76 | |
| * | | | | | | | | | | http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient versions of cURL | Junio C Hamano | 2009-03-12 | 1 | -3/+1 | |
| * | | | | | | | | | | http authentication via prompts | Junio C Hamano | 2009-03-10 | 1 | -0/+60 | |
| * | | | | | | | | | | http_init(): Fix config file parsing | Junio C Hamano | 2009-03-10 | 1 | -42/+27 | |
| * | | | | | | | | | | http.c: style cleanups | Junio C Hamano | 2009-03-09 | 1 | -23/+21 | |
* | | | | | | | | | | | Merge branch 'jk/reflog-date' | Junio C Hamano | 2009-03-26 | 3 | -6/+78 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | make oneline reflog dates more consistent with multiline format | Jeff King | 2009-03-20 | 3 | -6/+78 | |
* | | | | | | | | | | | | Merge branch 'jc/attributes-checkout' | Junio C Hamano | 2009-03-26 | 4 | -18/+95 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Add a test for checking whether gitattributes is honored by checkout. | Kristian Amlie | 2009-03-20 | 1 | -0/+31 | |
| * | | | | | | | | | | | | Read attributes from the index that is being checked out | Junio C Hamano | 2009-03-13 | 3 | -18/+64 |