Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge git://git.kernel.org/pub/scm/gitk/gitk | Junio C Hamano | 2008-10-20 | 5 | -1067/+1340 |
|\ | |||||
| * | gitk: Turn short SHA1 names into links too | Paul Mackerras | 2008-10-21 | 1 | -30/+77 |
| * | gitk: Regenerate .po files | Paul Mackerras | 2008-10-18 | 5 | -966/+1037 |
| * | gitk: New way of constructing menus that allows for Alt+letter accelerators | Paul Mackerras | 2008-10-17 | 1 | -70/+98 |
| * | gitk: Bind Key-Return to create on new branch dialog | Richard Quirk | 2008-10-16 | 1 | -0/+1 |
| * | gitk: Fix binding for <Return> in sha1 entry field | Paul Mackerras | 2008-10-16 | 1 | -1/+1 |
| * | gitk: Clean up file encoding code and add enable/disable option | Paul Mackerras | 2008-10-15 | 1 | -59/+92 |
| * | gitk: Implement batch lookup and caching of encoding attrs | Alexander Gavrilov | 2008-10-14 | 1 | -1/+34 |
| * | gitk: Enhance file encoding support | Alexander Gavrilov | 2008-10-14 | 1 | -11/+63 |
| * | gitk: Add untranslated error messages to translation | Christian Stimming | 2008-09-21 | 1 | -9/+9 |
| * | gitk: Fix a bug in collapsing deeply nested trees | Alexander Gavrilov | 2008-09-21 | 1 | -1/+1 |
| * | gitk: Use <Button-2> for context menus on OSX | Paul Mackerras | 2008-09-21 | 1 | -5/+13 |
* | | document "intent to add" option to git-add | Jeff King | 2008-10-20 | 1 | -2/+11 |
* | | Merge branch 'sh/maint-rebase3' | Junio C Hamano | 2008-10-19 | 2 | -2/+174 |
|\ \ | |||||
| * | | rebase--interactive: fix parent rewriting for dropped commits | Stephen Haberman | 2008-10-16 | 2 | -2/+174 |
* | | | Merge branch 'tr/workflow-doc' | Junio C Hamano | 2008-10-19 | 6 | -8/+500 |
|\ \ \ | |||||
| * | | | Documentation: add manpage about workflows | Thomas Rast | 2008-10-19 | 2 | -1/+365 |
| * | | | Documentation: Refer to git-rebase(1) to warn against rewriting | Thomas Rast | 2008-09-15 | 3 | -2/+10 |
| * | | | Documentation: new upstream rebase recovery section in git-rebase | Thomas Rast | 2008-09-15 | 1 | -5/+125 |
* | | | | Merge branch 'mv/clonev' | Junio C Hamano | 2008-10-19 | 5 | -1/+25 |
|\ \ \ \ | |||||
| * | | | | Implement git clone -v | Miklos Vajna | 2008-10-09 | 5 | -1/+25 |
* | | | | | Merge branch 'ml/cygwin-filemode' | Junio C Hamano | 2008-10-19 | 2 | -5/+17 |
|\ \ \ \ \ | |||||
| * | | | | | compat/cygwin.c - Use cygwin's stat if core.filemode == true | Mark Levedahl | 2008-10-13 | 2 | -5/+17 |
* | | | | | | Merge branch 'gb/refactor-pathinfo' | Junio C Hamano | 2008-10-19 | 1 | -137/+178 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gitweb: refactor input parameters parse/validation | Giuseppe Bilotta | 2008-10-12 | 1 | -137/+178 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'dp/checkattr' | Junio C Hamano | 2008-10-19 | 3 | -25/+110 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-check-attr(1): use 'verse' for multi-line synopsis sections | Jonas Fonseca | 2008-10-16 | 1 | -1/+2 |
| * | | | | | | check-attr: Add --stdin option | Dmitry Potapov | 2008-10-12 | 3 | -11/+89 |
| * | | | | | | check-attr: add an internal check_attr() function | Dmitry Potapov | 2008-10-12 | 1 | -18/+24 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'gb/formatpatch-autonbr' | Junio C Hamano | 2008-10-19 | 15 | -32/+298 |
|\ \ \ \ \ \ | |||||
| * | | | | | | format-patch: autonumber by default | Brian Gernhardt | 2008-10-18 | 15 | -32/+298 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'sp/describe-lwtag' | Junio C Hamano | 2008-10-19 | 3 | -10/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | describe: Make --tags and --all match lightweight tags more often | Shawn O. Pearce | 2008-10-17 | 3 | -10/+13 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'ae/preservemerge' | Junio C Hamano | 2008-10-19 | 3 | -5/+81 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rebase: Support preserving merges in non-interactive mode | Andreas Ericsson | 2008-09-30 | 3 | -5/+81 |
* | | | | | | | Merge branch 'mv/merge-noff' | Junio C Hamano | 2008-10-19 | 4 | -1/+40 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | builtin-commit: use reduce_heads() only when appropriate | Miklos Vajna | 2008-10-03 | 4 | -2/+41 |
* | | | | | | | | Merge branch 'ns/rebase-noverify' | Junio C Hamano | 2008-10-19 | 4 | -3/+35 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rebase: Document --no-verify option to bypass pre-rebase hook | Nanako Shiraishi | 2008-10-14 | 1 | -1/+4 |
| * | | | | | | | | rebase --no-verify | Nanako Shiraishi | 2008-10-06 | 3 | -2/+31 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-10-19 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation: Clarify '--signoff' for git-commit | Abhijit Bhopatkar | 2008-10-18 | 1 | -1/+2 |
* | | | | | | | | | | Fix mismerge at cdb22c4 in builtin-checkout.c | Junio C Hamano | 2008-10-19 | 1 | -3/+0 |
* | | | | | | | | | | git-merge-recursive: honor merge.conflictstyle once again | Matt McCutchen | 2008-10-19 | 1 | -1/+1 |
* | | | | | | | | | | Documentation: Spelling fix | Fredrik Skolmli | 2008-10-19 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'pb/rename-rowin32' | Junio C Hamano | 2008-10-19 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Do not rename read-only files during a push | Petr Baudis | 2008-10-18 | 1 | -2/+3 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Update draft release notes for 1.6.1 | Junio C Hamano | 2008-10-18 | 1 | -1/+6 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-10-18 | 4 | -10/+23 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Hopefully the final draft release notes update before 1.6.0.3 | Junio C Hamano | 2008-10-18 | 1 | -1/+9 |