Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Documentation: move callouts.xsl to manpage-{base,normal}.xsl | Chris Johnsen | 2009-03-27 | 3 | -1/+31 |
* | 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 |
* | | | | | | | Merge branch 'js/maint-diff-temp-smudge' | Junio C Hamano | 2009-03-26 | 2 | -3/+26 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Smudge the files fed to external diff and textconv | Johannes Schindelin | 2009-03-22 | 2 | -3/+26 |
* | | | | | | | | Merge branch 'js/maint-1.6.0-exec-path-env' | Junio C Hamano | 2009-03-26 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Propagate --exec-path setting to external commands via GIT_EXEC_PATH | Johannes Sixt | 2009-03-21 | 1 | -0/+4 |
* | | | | | | | | | Merge branch 'bc/maint-1.6.1-branch-deleted-was' | Junio C Hamano | 2009-03-26 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-branch: display "was sha1" on branch deletion rather than just "sha1" | Brandon Casey | 2009-03-21 | 2 | -2/+2 |
* | | | | | | | | | | Merge branch 'fg/push-default' | Junio C Hamano | 2009-03-26 | 6 | -5/+134 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | builtin-push.c: Fix typo: "anythig" -> "anything" | Kevin Ballard | 2009-03-25 | 1 | -1/+1 |
| * | | | | | | | | | | Display warning for default git push with no push.default config | Finn Arne Gangstad | 2009-03-17 | 2 | -0/+30 |
| * | | | | | | | | | | New config push.default to decide default behavior for push | Finn Arne Gangstad | 2009-03-17 | 5 | -5/+104 |
* | | | | | | | | | | | Merge branch 'dm/maint-docco' | Junio C Hamano | 2009-03-26 | 5 | -91/+91 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Documentation: Remove spurious uses of "you" in git-bisect.txt. | David J. Mellor | 2009-03-25 | 1 | -3/+3 |
| * | | | | | | | | | | | Documentation: minor grammatical fix in git-check-ref-format.txt | David J. Mellor | 2009-03-22 | 1 | -20/+20 |
| * | | | | | | | | | | | Documentation: minor grammatical fixes in git-check-attr.txt | David J. Mellor | 2009-03-22 | 1 | -8/+8 |
| * | | | | | | | | | | | Documentation: minor grammatical fixes in git-cat-file.txt | David J. Mellor | 2009-03-22 | 1 | -9/+9 |
| * | | | | | | | | | | | Documentation: minor grammatical fixes and rewording in git-bundle.txt | David J. Mellor | 2009-03-22 | 1 | -43/+43 |
| * | | | | | | | | | | | Documentation: remove some uses of the passive voice in git-bisect.txt | David J. Mellor | 2009-03-22 | 1 | -11/+11 |
* | | | | | | | | | | | | fast-export: Avoid dropping files from commits | Elijah Newren | 2009-03-25 | 2 | -3/+7 |
* | | | | | | | | | | | | Grammar fixes to "merge" and "patch-id" docs | Wincent Colaiuta | 2009-03-25 | 3 | -9/+9 |
* | | | | | | | | | | | | Correct missing SP characters in grammar comment at top of fast-import.c | Elijah Newren | 2009-03-25 | 1 | -3/+4 |
* | | | | | | | | | | | | git-filter-branch: avoid collisions with variables in eval'ed commands | Elijah Newren | 2009-03-25 | 1 | -3/+3 |
* | | | | | | | | | | | | Merge branch 'for-junio' of git://repo.or.cz/git/mingw/j6t | Junio C Hamano | 2009-03-25 | 3 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | t7502-commit: Skip SIGTERM test on Windows | Johannes Sixt | 2009-03-25 | 2 | -1/+3 |
| * | | | | | | | | | | | | t7005-editor: Use $SHELL_PATH in the editor scripts | Johannes Sixt | 2009-03-25 | 1 | -0/+1 |
* | | | | | | | | | | | | | Guard a few Makefile variables against user environments | Johannes Schindelin | 2009-03-25 | 1 | -0/+12 |
* | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-03-24 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Increase the size of the die/warning buffer to avoid truncation | Shawn O. Pearce | 2009-03-24 | 1 | -1/+1 |
| * | | | | | | | | | | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-03-24 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-03-24 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | close_sha1_file(): make it easier to diagnose errors | Linus Torvalds | 2009-03-24 | 1 | -1/+1 |