Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Update draft release notes to 1.6.0.3 | Junio C Hamano | 2008-10-13 | 1 | -2/+19 | |
* | | | | | | | Documentation: remove stale howto/rebase-and-edit.txt | Thomas Rast | 2008-10-12 | 1 | -79/+0 | |
| |_|_|_|/ / |/| | | | | | ||||||
* | | | | | | Merge branch 'js/objc-funchdr' | Shawn O. Pearce | 2008-10-09 | 1 | -0/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Teach git diff about Objective-C syntax | Jonathan del Strother | 2008-10-06 | 1 | -0/+2 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge branch 'dm/svn-branch' | Shawn O. Pearce | 2008-10-09 | 1 | -1/+23 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add git-svn branch to allow branch creation in SVN repositories | Florian Ragwitz | 2008-10-06 | 1 | -1/+23 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'dp/cywginstat' | Shawn O. Pearce | 2008-10-09 | 1 | -0/+9 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | cygwin: Use native Win32 API for stat | Dmitry Potapov | 2008-09-30 | 1 | -0/+9 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge branch 'mw/sendemail' | Shawn O. Pearce | 2008-10-09 | 1 | -139/+103 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | send-email: signedoffcc -> signedoffbycc, but handle both | Michael Witten | 2008-10-01 | 1 | -1/+1 | |
| * | | | | | | Docs: send-email: Create logical groupings for man text | Michael Witten | 2008-10-01 | 1 | -50/+69 | |
| * | | | | | | Docs: send-email: Remove unnecessary config variable description | Michael Witten | 2008-10-01 | 1 | -75/+16 | |
| * | | | | | | Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to | Michael Witten | 2008-10-01 | 1 | -1/+1 | |
| * | | | | | | send-email: change --no-validate to boolean --[no-]validate | Michael Witten | 2008-10-01 | 1 | -2/+7 | |
| * | | | | | | Docs: send-email: Man page option ordering | Michael Witten | 2008-10-01 | 1 | -72/+66 | |
| * | | | | | | Docs: send-email's usage text and man page mention same options | Michael Witten | 2008-10-01 | 1 | -8/+13 | |
* | | | | | | | Merge branch 'rz/grepz' | Shawn O. Pearce | 2008-10-09 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | git grep: Add "-z/--null" option as in GNU's grep. | Raphael Zimmerer | 2008-10-01 | 1 | -0/+6 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge branch 'mg/verboseprune' | Shawn O. Pearce | 2008-10-09 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | make prune report removed objects on -v | Michael J Gruber | 2008-09-30 | 1 | -1/+4 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'maint' | Shawn O. Pearce | 2008-10-08 | 2 | -9/+23 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | / / / | | |_|/ / / | |/| | | | | ||||||
| * | | | | | git-push.txt: Describe --repo option in more detail | Johannes Sixt | 2008-10-08 | 1 | -5/+19 | |
| * | | | | | Fix a few typos in relnotes | Mikael Magnusson | 2008-10-07 | 1 | -4/+4 | |
* | | | | | | Merge branch 'maint' | Shawn O. Pearce | 2008-10-06 | 2 | -1/+58 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Update release notes for 1.6.0.3 | Shawn O. Pearce | 2008-10-06 | 1 | -1/+51 | |
| * | | | | | docs: describe pre-rebase hook | Nanako Shiraishi | 2008-10-06 | 1 | -0/+7 | |
* | | | | | | run-command.c: remove run_command_v_opt_cd() | Nanako Shiraishi | 2008-10-02 | 1 | -1/+1 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Merge branch 'maint' | Shawn O. Pearce | 2008-10-01 | 3 | -9/+12 | |
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | ||||||
| * | | | Improve git-log documentation wrt file filters | martin f. krafft | 2008-10-01 | 1 | -3/+6 | |
| * | | | Documentation: remove '\' in front of short options | SZEDER Gábor | 2008-10-01 | 2 | -6/+6 | |
* | | | | Merge branch 'maint' | Shawn O. Pearce | 2008-09-30 | 1 | -4/+4 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Replace svn.foo.org with svn.example.com in git-svn docs (RFC 2606) | Michael Prokop | 2008-09-30 | 1 | -4/+4 | |
* | | | | Correct typos in RelNotes-1.6.1 | Ralf Wildenhues | 2008-09-30 | 2 | -3/+3 | |
* | | | | Merge branch 'bc/master-diff-hunk-header-fix' | Shawn O. Pearce | 2008-09-29 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'maint' into bc/master-diff-hunk-header-fix | Shawn O. Pearce | 2008-09-29 | 6 | -46/+98 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into maint | Shawn O. Pearce | 2008-09-29 | 1 | -2/+2 | |
| | |\ \ \ | ||||||
| * | \ \ \ | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix | Junio C Hamano | 2008-09-18 | 5 | -9/+30 | |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | * | | | | diff.*.xfuncname which uses "extended" regex's for hunk header selection | Brandon Casey | 2008-09-18 | 1 | -2/+2 | |
* | | | | | | Merge branch 'jc/better-conflict-resolution' | Shawn O. Pearce | 2008-09-29 | 3 | -7/+107 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix AsciiDoc errors in merge documentation | Johan Herland | 2008-09-04 | 1 | -4/+4 | |
| * | | | | | | git-merge documentation: describe how conflict is presented | Junio C Hamano | 2008-08-31 | 1 | -0/+65 | |
| * | | | | | | checkout --conflict=<style>: recreate merge in a non-default style | Junio C Hamano | 2008-08-31 | 1 | -1/+9 | |
| * | | | | | | checkout -m: recreate merge when checking out of unmerged index | Junio C Hamano | 2008-08-30 | 1 | -3/+8 | |
| * | | | | | | Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution' | Junio C Hamano | 2008-08-30 | 1 | -6/+20 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | checkout --ours/--theirs: allow checking out one side of a conflicting merge | Junio C Hamano | 2008-08-30 | 1 | -2/+9 | |
| | * | | | | | | checkout -f: allow ignoring unmerged paths when checking out of the index | Junio C Hamano | 2008-08-30 | 1 | -6/+13 | |
| * | | | | | | | merge.conflictstyle: choose between "merge" and "diff3 -m" styles | Junio C Hamano | 2008-08-30 | 1 | -0/+8 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge branch 'maint' | Shawn O. Pearce | 2008-09-26 | 1 | -2/+11 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | Documentation: clarify the details of overriding LESS via core.pager | Chris Frey | 2008-09-26 | 1 | -2/+11 | |
* | | | | | | | Merge branch 'jc/apply-include-exclude' | Shawn O. Pearce | 2008-09-25 | 1 | -1/+13 | |
|\ \ \ \ \ \ \ |