Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | refactor merge flags into xmparam_t | Bert Wesarg | 2010-03-02 | 4 | -29/+25 |
* | make union merge an xdl merge favor | Bert Wesarg | 2010-03-02 | 3 | -45/+19 |
* | Git 1.7.0v1.7.0 | Junio C Hamano | 2010-02-12 | 3 | -1/+11 |
* | 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 |
* | | bash: support 'git am's new '--continue' option | SZEDER Gábor | 2010-02-12 | 1 | -1/+1 |
* | | Merge branch 'maint' | Junio C Hamano | 2010-02-11 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | filter-branch: Fix error message for --prune-empty --commit-filter | Jacob Helwig | 2010-02-11 | 1 | -1/+1 |
* | | am: switch --resolved to --continue | Jeff King | 2010-02-11 | 2 | -3/+5 |
* | | 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 | 4 | -4/+53 |
|\ \ | |/ | |||||
| * | Git 1.6.6.2v1.6.6.2 | Junio C Hamano | 2010-02-10 | 4 | -3/+50 |
| * | Merge branch 'maint-1.6.5' into maint | Junio C Hamano | 2010-02-10 | 1 | -2/+4 |
| |\ | |||||
| | * | t8003: check exit code of command and error message separately | Junio C Hamano | 2010-02-10 | 1 | -2/+4 |
| * | | Merge branch 'sp/maint-fast-import-large-blob' into maint | Junio C Hamano | 2010-02-10 | 5 | -20/+227 |
| |\ \ | |||||
| * \ \ | Merge branch 'gp/maint-cvsserver' into maint | Junio C Hamano | 2010-02-10 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jc/maint-reflog-bad-timestamp' into maint | Junio C Hamano | 2010-02-10 | 4 | -10/+86 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'il/maint-xmallocz' into maint | Junio C Hamano | 2010-02-10 | 4 | -10/+15 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jh/maint-config-file-prefix' into maint | Junio C Hamano | 2010-02-10 | 2 | -1/+12 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'nd/include-termios-for-osol' into maint | Junio C Hamano | 2010-02-10 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maint | Junio C Hamano | 2010-02-10 | 2 | -1/+58 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'rs/maint-archive-match-pathspec' into maint | Junio C Hamano | 2010-02-10 | 1 | -1/+24 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | check-ref-format documentation: fix enumeration mark-up | Junio C Hamano | 2010-02-10 | 1 | -1/+1 |
* | | | | | | | | | | | Documentation: quote braces in {upstream} notation | Thomas Rast | 2010-02-10 | 1 | -1/+1 |
* | | | | | | | | | | | t3902: Protect against OS X normalization | Brian Gernhardt | 2010-02-08 | 1 | -4/+4 |
* | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-02-08 | 5 | -14/+28 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge branch 'maint-1.6.5' into maint | Junio C Hamano | 2010-02-08 | 2 | -1/+9 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| | * | | | | | | | | | blame: prevent a segv when -L given start > EOF | Jay Soffian | 2010-02-08 | 2 | -1/+9 |
| | * | | | | | | | | | Merge branch 'sb/maint-octopus' into maint-1.6.5 | Junio C Hamano | 2010-02-01 | 2 | -9/+57 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'bg/maint-add-all-doc' into maint-1.6.5 | Junio C Hamano | 2010-02-01 | 2 | -29/+88 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-push-doc-status' into maint | Junio C Hamano | 2010-02-08 | 1 | -5/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | git-push: document all the status flags used in the output | Junio C Hamano | 2010-02-08 | 1 | -5/+10 |
| * | | | | | | | | | | | | | Merge branch 'jc/maint-imap-config-parse' into maint | Junio C Hamano | 2010-02-08 | 1 | -7/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Fix parsing of imap.preformattedHTML and imap.sslverify | Junio C Hamano | 2010-02-08 | 1 | -7/+8 |
| * | | | | | | | | | | | | | | Merge branch 'jc/maint-doc-git-add-example' into maint | Junio C Hamano | 2010-02-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | git-add documentation: Fix shell quoting example | Junio C Hamano | 2010-02-08 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Revert "pack-objects: fix pack generation when using pack_size_limit" | Nicolas Pitre | 2010-02-08 | 2 | -12/+10 |
* | | | | | | | | | | | | | | | | Merge git://repo.or.cz/git-guiv1.7.0-rc2 | Junio C Hamano | 2010-02-07 | 34 | -2514/+3126 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | git-gui: update french translation | Emmanuel Trillaud | 2010-02-02 | 1 | -320/+366 |
| * | | | | | | | | | | | | | | | | git-gui: update Japanese translation | Nanako Shiraishi | 2010-02-02 | 1 | -314/+339 |
| * | | | | | | | | | | | | | | | | Merge branch 'maint' | Shawn O. Pearce | 2010-01-29 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | git-gui: fix shortcut for menu "Commit/Revert Changes" | Heiko Voigt | 2010-01-29 | 1 | -0/+2 |
| * | | | | | | | | | | | | | | | | | git-gui: Quote git path when starting another gui in a submodule | Jens Lehmann | 2010-01-28 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | git-gui: update Italian translation | Michele Ballabio | 2010-01-28 | 1 | -299/+323 |
| * | | | | | | | | | | | | | | | | | git-gui: Update Swedish translation (520t0f0u) | Peter Krefting | 2010-01-28 | 1 | -290/+324 |
| * | | | | | | | | | | | | | | | | | git-gui: use themed tk widgets with Tk 8.5 | Pat Thoyts | 2010-01-27 | 26 | -453/+697 |
| * | | | | | | | | | | | | | | | | | git-gui: Update German translation (12 new or changed strings). | Christian Stimming | 2010-01-27 | 1 | -398/+426 |