Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'da/araxis-mergetool' | Junio C Hamano | 2009-06-13 | 3 | -3/+3 |
|\ | |||||
| * | mergetool--lib: add support for araxis merge | David Aguilar | 2009-05-24 | 3 | -3/+3 |
* | | Merge branch 'maint' | Junio C Hamano | 2009-06-11 | 1 | -0/+4 |
|\ \ | |||||
| * | | Documentation: git-send-mail can take rev-list arg to drive format-patch | Paolo Bonzini | 2009-06-11 | 1 | -0/+4 |
* | | | git-repack.txt: Clarify implications of -a for dumb protocols | Michael J Gruber | 2009-06-09 | 1 | -2/+5 |
* | | | Documentation: mention 'git stash pop --index' option explicitly | SZEDER Gábor | 2009-06-09 | 1 | -8/+8 |
* | | | Merge branch 'maint' | Junio C Hamano | 2009-06-06 | 2 | -1/+8 |
|\ \ \ | |/ / | |||||
| * | | Documentation: refer to gitworkflows(7) from tutorial and git(1) | Thomas Rast | 2009-06-06 | 2 | -1/+8 |
* | | | Documentation/git.txt: update links to release notes | Junio C Hamano | 2009-06-03 | 1 | -1/+6 |
* | | | Merge branch 'maint' to sync with 1.6.3.2 | Junio C Hamano | 2009-06-03 | 1 | -7/+5 |
|\ \ \ | |/ / | |||||
| * | | GIT 1.6.3.2v1.6.3.2 | Junio C Hamano | 2009-06-03 | 1 | -7/+5 |
* | | | Merge branch 'maint' | Junio C Hamano | 2009-06-03 | 1 | -14/+26 |
|\ \ \ | |/ / | |||||
| * | | Update draft release notes for 1.6.3.2 | Junio C Hamano | 2009-06-02 | 1 | -14/+26 |
| * | | Documentation: teach stash/pop workflow instead of stash/apply | Thomas Rast | 2009-05-28 | 2 | -16/+18 |
* | | | git-show-branch.txt: document --date-order option | Stephen Boyd | 2009-06-01 | 1 | -3/+9 |
* | | | Merge branch 'sb/opt-filename' | Junio C Hamano | 2009-05-31 | 1 | -2/+7 |
|\ \ \ | |||||
| * | | | parse-opts: add OPT_FILENAME and transition builtins | Stephen Boyd | 2009-05-25 | 1 | -0/+5 |
| * | | | parse-opts: prepare for OPT_FILENAME | Stephen Boyd | 2009-05-25 | 1 | -2/+2 |
| * | | | Merge branch 'jc/mktree' into sb/opt-filename | Junio C Hamano | 2009-05-25 | 1 | -3/+16 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'jc/mktree' | Junio C Hamano | 2009-05-31 | 1 | -3/+16 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | mktree --batch: build more than one tree object | Josh Micich | 2009-05-16 | 1 | -1/+7 |
| * | | | | mktree --missing: updated usage message and man page | Josh Micich | 2009-05-16 | 1 | -3/+10 |
* | | | | | Merge branch 'mw/send-email' | Junio C Hamano | 2009-05-31 | 1 | -12/+15 |
|\ \ \ \ \ | |||||
| * | | | | | Docs: send-email: --smtp-server-port can take symbolic ports | Michael Witten | 2009-04-14 | 1 | -1/+3 |
| * | | | | | Docs: send-email: Refer to CONFIGURATION section for sendemail.multiedit | Michael Witten | 2009-04-14 | 1 | -3/+4 |
| * | | | | | Docs: send-email: Put options back into alphabetical order | Michael Witten | 2009-04-14 | 1 | -11/+11 |
* | | | | | | config.txt: document add.ignore-errors | Stephen Boyd | 2009-05-31 | 1 | -0/+5 |
* | | | | | | git-apply(1): Clarify that one can select where to apply the patch | Björn Steinbrink | 2009-05-31 | 1 | -1/+1 |
* | | | | | | Documentation: teach stash/pop workflow instead of stash/apply | Thomas Rast | 2009-05-30 | 2 | -16/+18 |
* | | | | | | Update draft release notes to 1.6.4 | Junio C Hamano | 2009-05-25 | 1 | -1/+35 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-05-25 | 3 | -3/+55 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Prepare for 1.6.3.2 | Junio C Hamano | 2009-05-25 | 1 | -0/+51 |
| * | | | | fix cat-file usage message and documentation | Jeff King | 2009-05-25 | 1 | -2/+2 |
| * | | | | merge-options.txt: Clarify merge --squash | Michael J Gruber | 2009-05-25 | 1 | -1/+2 |
* | | | | | Merge branch 'tp/send-email-from-config' | Junio C Hamano | 2009-05-23 | 1 | -3/+6 |
|\ \ \ \ \ | |||||
| * | | | | | send-email: Add config option for sender address | Trent Piepho | 2009-05-13 | 1 | -3/+6 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'cc/bisect' (early part) | Junio C Hamano | 2009-05-23 | 1 | -1/+34 |
|\ \ \ \ \ | |||||
| * | | | | | rev-parse: add --sq-quote to shell quote arguments | Christian Couder | 2009-05-10 | 1 | -1/+34 |
| |/ / / / | |||||
* | | | | | Merge branch 'rr/forbid-bs-in-ref' | Junio C Hamano | 2009-05-23 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Disallow '\' in ref names | Robin Rosenberg | 2009-05-09 | 1 | -0/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'rs/grep-parseopt' | Junio C Hamano | 2009-05-23 | 1 | -0/+12 |
|\ \ \ \ \ | |||||
| * | | | | | parseopt: add OPT_NUMBER_CALLBACK | René Scharfe | 2009-05-09 | 1 | -0/+8 |
| * | | | | | parseopt: add OPT_NEGBIT | René Scharfe | 2009-05-09 | 1 | -0/+4 |
* | | | | | | Merge branch 'mt/submodule-reference' | Junio C Hamano | 2009-05-23 | 1 | -2/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add --reference option to git submodule. | Michael S. Tsirkin | 2009-05-09 | 1 | -2/+12 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | doc/git-rebase.txt: remove mention of multiple strategies | Nguyễn Thái Ngọc Duy | 2009-05-21 | 1 | -2/+1 |
* | | | | | | git-svn: add --authors-prog option | Mark Lodato | 2009-05-21 | 1 | -0/+8 |
* | | | | | | Merge branch 'js/add-edit' | Junio C Hamano | 2009-05-18 | 1 | -1/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-add: introduce --edit (to edit the diff vs. the index) | Johannes Schindelin | 2009-04-12 | 1 | -1/+10 |
* | | | | | | | Merge branch 'mh/show-branch-color' | Junio C Hamano | 2009-05-18 | 2 | -0/+15 |
|\ \ \ \ \ \ \ |