Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jn/maint-fix-pager' | Junio C Hamano | 2010-03-02 | 2 | -3/+7 |
|\ | |||||
| * | git.1: Clarify the behavior of the --paginate option | Jonathan Nieder | 2010-02-14 | 1 | -2/+6 |
| * | Fix 'git var' usage synopsis | Jonathan Nieder | 2010-02-14 | 1 | -1/+1 |
* | | Merge branch 'hm/imap-send-cram-md5' | Junio C Hamano | 2010-03-02 | 1 | -0/+4 |
|\ \ | |||||
| * | | imap-send: support CRAM-MD5 authentication | Hitoshi Mitake | 2010-02-17 | 1 | -0/+4 |
* | | | Merge branch 'ml/color-when' | Junio C Hamano | 2010-03-02 | 5 | -7/+27 |
|\ \ \ | |||||
| * | | | Add an optional argument for --color options | Mark Lodato | 2010-02-18 | 5 | -7/+27 |
| | |/ | |/| | |||||
* | | | Merge branch 'ac/cvsimport-revision-mapping' | Junio C Hamano | 2010-03-02 | 1 | -1/+17 |
|\ \ \ | |||||
| * | | | cvsimport: new -R option: generate .git/cvs-revisions mapping | Aaron Crane | 2010-02-06 | 1 | -1/+17 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2010-02-28 | 3 | -9/+12 |
|\ \ \ \ | |||||
| * | | | | Git 1.7.0.1v1.7.0.1 | Junio C Hamano | 2010-02-28 | 2 | -6/+11 |
| * | | | | Remove reference to GREP_COLORS from documentation | Mark Lodato | 2010-02-28 | 1 | -3/+1 |
| * | | | | Merge branch 'ml/maint-grep-doc' into maint | Junio C Hamano | 2010-02-24 | 1 | -5/+12 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'maint' | Junio C Hamano | 2010-02-23 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Documentation: mention conflict marker size argument (%L) for merge driver | Bert Wesarg | 2010-02-23 | 1 | -1/+2 |
* | | | | | | Merge branch 'ml/maint-grep-doc' | Junio C Hamano | 2010-02-21 | 1 | -5/+12 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | grep documentation: clarify what files match | Mark Lodato | 2010-02-16 | 1 | -5/+12 |
* | | | | | | Merge branch 'sp/push-sideband' | Junio C Hamano | 2010-02-21 | 1 | -11/+41 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'sp/maint-push-sideband' into sp/push-sideband | Junio C Hamano | 2010-02-05 | 1 | -11/+41 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | run-command: support custom fd-set in async | Erik Faye-Lund | 2010-02-05 | 1 | -10/+40 |
| | * | | | | | run-command: Allow stderr to be a caller supplied pipe | Shawn O. Pearce | 2010-02-05 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jc/checkout-detached' | Junio C Hamano | 2010-02-21 | 1 | -0/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Reword "detached HEAD" notification | Junio C Hamano | 2010-01-29 | 1 | -0/+5 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-02-20 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Documentation: Fix indentation problem in git-commit(1) | Jacob Helwig | 2010-02-19 | 1 | -3/+3 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-02-19 | 5 | -28/+36 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Documentation: describe --thin more accurately | Stephen Boyd | 2010-02-18 | 5 | -28/+36 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-02-17 | 10 | -36/+39 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | docs: don't talk about $GIT_DIR/refs/ everywhere | Jeff King | 2010-02-17 | 10 | -36/+39 |
* | | | | | | | | Merge branch 'np/fast-import-idx-v2' | Junio C Hamano | 2010-02-17 | 1 | -4/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fast-import: make default pack size unlimited | Nicolas Pitre | 2010-02-17 | 1 | -4/+1 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Update draft release notes to 1.7.1 | Junio C Hamano | 2010-02-17 | 1 | -1/+4 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-02-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Update 1.7.0.1 release notes | Junio C Hamano | 2010-02-17 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-02-16 | 1 | -1/+21 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Prepare 1.7.0.1 release notes | Junio C Hamano | 2010-02-16 | 1 | -1/+21 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-02-13 | 1 | -0/+11 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Start 1.7.0 maintenance track | Junio C Hamano | 2010-02-13 | 1 | -0/+11 |
| |/ / / / / | |||||
* | | | | | | Start 1.7.1 cycle | Junio C Hamano | 2010-02-13 | 1 | -0/+17 |
|/ / / / / | |||||
* | | | | | Git 1.7.0v1.7.0 | Junio C Hamano | 2010-02-12 | 2 | -0/+10 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2010-02-12 | 2 | -2/+2 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Fix typo in 1.6.6.2 release notes | Junio C Hamano | 2010-02-12 | 1 | -1/+1 |
| * | | | | Re-fix check-ref-format documentation mark-up | Junio C Hamano | 2010-02-12 | 1 | -1/+1 |
* | | | | | archive documentation: attributes are taken from the tree by default | Junio C Hamano | 2010-02-12 | 1 | -0/+8 |
* | | | | | Documentation: minor fixes to RelNotes-1.7.0 | Michael J Gruber | 2010-02-12 | 1 | -8/+8 |
* | | | | | am: switch --resolved to --continue | Jeff King | 2010-02-11 | 1 | -1/+2 |
* | | | | | Update draft release notes to 1.7.0 one more time | Junio C Hamano | 2010-02-10 | 1 | -15/+1 |
* | | | | | Sync with 1.6.6.2 | Junio C Hamano | 2010-02-10 | 3 | -2/+49 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Git 1.6.6.2v1.6.6.2 | Junio C Hamano | 2010-02-10 | 2 | -1/+48 |
| * | | | | Merge branch 'sp/maint-fast-import-large-blob' into maint | Junio C Hamano | 2010-02-10 | 2 | -0/+20 |
| |\ \ \ \ |