Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bg/maint-remote-update-default' | Junio C Hamano | 2010-01-10 | 2 | -6/+18 |
|\ | |||||
| * | Fix "git remote update" with remotes.defalt set | Björn Gustavsson | 2009-12-31 | 2 | -6/+18 |
* | | Merge branch 'mm/diag-path-in-treeish' | Junio C Hamano | 2010-01-10 | 4 | -7/+198 |
|\ \ | |||||
| * | | Detailed diagnosis when parsing an object name fails. | Matthieu Moy | 2009-12-07 | 4 | -7/+198 |
* | | | Merge branch 'fc/opt-quiet-gc-reset' | Junio C Hamano | 2010-01-10 | 3 | -3/+3 |
|\ \ \ | |||||
| * | | | General --quiet improvements | Felipe Contreras | 2009-12-03 | 3 | -3/+3 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2010-01-10 | 3 | -26/+21 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'maint-1.6.2' into maint | Junio C Hamano | 2010-01-10 | 2 | -13/+11 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'maint-1.6.1' into maint-1.6.2 | Junio C Hamano | 2010-01-10 | 8 | -43/+47 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2010-01-10 | 4 | -28/+28 |
| | | |\ \ \ \ | |||||
| | | | * | | | | base85: Make the code more obvious instead of explaining the non-obvious | Andreas Gruenbacher | 2010-01-09 | 1 | -8/+2 |
| | | | * | | | | base85: encode_85() does not use the decode table | Andreas Gruenbacher | 2010-01-09 | 1 | -2/+0 |
| | | | * | | | | base85 debug code: Fix length byte calculation | Andreas Gruenbacher | 2010-01-09 | 1 | -1/+1 |
| | | | * | | | | checkout -m: do not try to fall back to --merge from an unborn branch | Junio C Hamano | 2010-01-06 | 1 | -2/+8 |
| * | | | | | | | Documentation: tiny git config manual tweaks | Jonathan Nieder | 2010-01-09 | 1 | -4/+4 |
| * | | | | | | | Documentation: git gc packs refs by default now | Jonathan Nieder | 2010-01-09 | 1 | -9/+6 |
* | | | | | | | | daemon: consider only address in kill_some_child() | Erik Faye-Lund | 2010-01-09 | 1 | -8/+20 |
* | | | | | | | | help: fix configured help format taking over command line one | Christian Couder | 2010-01-09 | 1 | -1/+8 |
* | | | | | | | | string-list: rename the include guard to STRING_LIST_H | Thiago Farina | 2010-01-09 | 1 | -3/+3 |
* | | | | | | | | Describe second batch for 1.7.0 in draft release notes | Junio C Hamano | 2010-01-07 | 1 | -1/+7 |
* | | | | | | | | Merge branch 'js/filter-branch-prime' | Junio C Hamano | 2010-01-07 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | filter-branch: remove an unnecessary use of 'git read-tree' | Johannes Sixt | 2009-12-15 | 1 | -1/+0 |
* | | | | | | | | | Merge branch 'sb/maint-octopus' | Junio C Hamano | 2010-01-07 | 2 | -9/+57 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | octopus: remove dead code | Stephen Boyd | 2009-12-13 | 1 | -5/+1 |
| * | | | | | | | | | octopus: reenable fast-forward merges | Stephen Boyd | 2009-12-13 | 2 | -1/+19 |
| * | | | | | | | | | octopus: make merge process simpler to follow | Stephen Boyd | 2009-12-13 | 2 | -4/+38 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'mg/tag-d-show' | Junio C Hamano | 2010-01-07 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | tag -d: print sha1 of deleted tag | Michael J Gruber | 2009-12-10 | 1 | -1/+3 |
* | | | | | | | | | | Merge branch 'so/cvsserver-update' | Junio C Hamano | 2010-01-07 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | cvsserver: make the output of 'update' more compatible with cvs. | Sergei Organov | 2009-12-31 | 1 | -0/+16 |
* | | | | | | | | | | | Merge branch 'bg/maint-add-all-doc' | Junio C Hamano | 2010-01-07 | 2 | -29/+88 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-rm doc: Describe how to sync index & work tree | Björn Gustavsson | 2010-01-07 | 1 | -1/+53 |
| * | | | | | | | | | | | git-add/rm doc: Consistently back-quote | Björn Gustavsson | 2009-12-07 | 2 | -15/+15 |
| * | | | | | | | | | | | Documentation: 'git add -A' can remove files | Björn Gustavsson | 2009-12-07 | 1 | -13/+20 |
* | | | | | | | | | | | | Merge branch 'mv/commit-date' | Junio C Hamano | 2010-01-07 | 5 | -2/+53 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Document date formats accepted by parse_date() | Miklos Vajna | 2009-12-03 | 3 | -0/+29 |
| * | | | | | | | | | | | | builtin-commit: add --date option | Miklos Vajna | 2009-12-03 | 3 | -2/+24 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'mo/bin-wrappers' | Junio C Hamano | 2010-01-07 | 6 | -32/+93 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | INSTALL: document a simpler way to run uninstalled builds | Matthew Ogilvie | 2009-12-03 | 1 | -7/+11 |
| * | | | | | | | | | | | | run test suite without dashed git-commands in PATH | Matthew Ogilvie | 2009-12-03 | 2 | -12/+30 |
| * | | | | | | | | | | | | build dashless "bin-wrappers" directory similar to installed bindir | Matthew Ogilvie | 2009-12-03 | 3 | -13/+52 |
* | | | | | | | | | | | | | .gitattributes: detect 8-space indent in shell scripts | Junio C Hamano | 2010-01-06 | 1 | -0/+1 |
* | | | | | | | | | | | | | Makefile: make ppc/sha1ppc.o depend on GIT-CFLAGS | Jonathan Nieder | 2010-01-05 | 1 | -1/+1 |
* | | | | | | | | | | | | | Use warning function instead of fprintf(stderr, "Warning: ..."). | Thiago Farina | 2010-01-03 | 4 | -7/+5 |
* | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-01-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | stash: mention --patch in usage string. | Matthieu Moy | 2010-01-02 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-12-31 | 5 | -21/+37 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-12-31 | 2 | -15/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | branch: die explicitly why when calling "git branch [-a|-r] branchname". | Matthieu Moy | 2009-12-31 | 2 | -15/+17 |
| * | | | | | | | | | | | | fast-import: Document author/committer/tagger name is optional | Shawn O. Pearce | 2009-12-31 | 2 | -6/+6 |