Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | t6019: test file dropped in -s ours merge | Kevin Bracey | 2013-05-16 | 1 | -0/+19 | |
| * | | | | decorate.c: compact table when growing | Kevin Bracey | 2013-05-16 | 1 | -1/+1 | |
* | | | | | Merge branch 'rr/remove-contrib-some' | Junio C Hamano | 2013-06-14 | 5 | -792/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | contrib: drop blameview/ directory | Jeff King | 2013-06-12 | 2 | -164/+0 | |
| * | | | | | contrib: remove continuous/ and patches/ | Ramkumar Ramachandra | 2013-06-03 | 3 | -628/+0 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Fix `git svn` `rebase` & `dcommit` if top-level HEAD directory exist | Slava Kardakov | 2013-06-12 | 1 | -2/+2 | |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2013-06-11 | 2 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'maint-1.8.2' into maint | Junio C Hamano | 2013-06-11 | 2 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | t0070 "mktemp to unwritable directory" needs SANITY | Torsten Bögershausen | 2013-06-11 | 1 | -1/+1 | |
| | * | | | | | pre-push.sample: Make the script executable | Wieland Hoffmann | 2013-06-11 | 1 | -0/+0 | |
| | | |_|_|/ | | |/| | | | ||||||
* | | | | | | Update draft release notes | Junio C Hamano | 2013-06-11 | 1 | -1/+48 | |
* | | | | | | Merge branch 'cm/gitweb-project-list-persistent-cgi-fix' | Junio C Hamano | 2013-06-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | gitweb: fix problem causing erroneous project list | Charles McGarvey | 2013-06-07 | 1 | -1/+1 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge branch 'rr/maint-fetch-tag-doc-asterisks' | Junio C Hamano | 2013-06-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fetch-options.txt: prevent a wildcard refspec from getting misformatted | Junio C Hamano | 2013-06-07 | 1 | -1/+1 | |
* | | | | | | | Merge branch 'rr/rebase-autostash' | Junio C Hamano | 2013-06-11 | 8 | -16/+235 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | rebase: implement --[no-]autostash and rebase.autostash | Ramkumar Ramachandra | 2013-05-29 | 4 | -3/+208 | |
| * | | | | | | | rebase --merge: return control to caller, for housekeeping | Ramkumar Ramachandra | 2013-05-13 | 1 | -3/+2 | |
| * | | | | | | | rebase -i: return control to caller, for housekeeping | Ramkumar Ramachandra | 2013-05-13 | 1 | -4/+5 | |
| * | | | | | | | am: return control to caller, for housekeeping | Ramkumar Ramachandra | 2013-05-13 | 2 | -6/+11 | |
| * | | | | | | | rebase: prepare to do generic housekeeping | Ramkumar Ramachandra | 2013-05-13 | 1 | -0/+7 | |
| * | | | | | | | rebase -i: don't error out if $state_dir already exists | Ramkumar Ramachandra | 2013-05-13 | 1 | -1/+1 | |
| * | | | | | | | am: tighten a conditional that checks for $dotest | Ramkumar Ramachandra | 2013-05-13 | 1 | -1/+3 | |
* | | | | | | | | Merge branch 'jk/test-exit-code-by-signal' | Junio C Hamano | 2013-06-11 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | t0005: skip signal death exit code test on Windows | Johannes Sixt | 2013-06-06 | 1 | -1/+1 | |
| * | | | | | | | | t0005: test git exit code from signal death | Jeff King | 2013-06-02 | 1 | -0/+7 | |
* | | | | | | | | | Merge branch 'fc/at-head' | Junio C Hamano | 2013-06-11 | 5 | -57/+123 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | sha1_name: compare variable with constant, not constant with variable | Felipe Contreras | 2013-05-08 | 1 | -5/+7 | |
| * | | | | | | | | | Add new @ shortcut for HEAD | Felipe Contreras | 2013-05-08 | 5 | -0/+28 | |
| * | | | | | | | | | sha1_name: refactor reinterpret() | Felipe Contreras | 2013-05-08 | 1 | -19/+23 | |
| * | | | | | | | | | sha1_name: check @{-N} errors sooner | Ramkumar Ramachandra | 2013-05-08 | 1 | -5/+4 | |
| * | | | | | | | | | sha1_name: reorganize get_sha1_basic() | Felipe Contreras | 2013-05-08 | 1 | -11/+19 | |
| * | | | | | | | | | sha1_name: don't waste cycles in the @-parsing loop | Ramkumar Ramachandra | 2013-05-08 | 1 | -1/+1 | |
| * | | | | | | | | | sha1_name: remove unnecessary braces | Felipe Contreras | 2013-05-08 | 1 | -3/+2 | |
| * | | | | | | | | | sha1_name: remove no-op | Felipe Contreras | 2013-05-08 | 1 | -1/+1 | |
| * | | | | | | | | | tests: at-combinations: @{N} versus HEAD@{N} | Ramkumar Ramachandra | 2013-05-08 | 1 | -0/+13 | |
| * | | | | | | | | | tests: at-combinations: increase coverage | Ramkumar Ramachandra | 2013-05-08 | 1 | -0/+8 | |
| * | | | | | | | | | tests: at-combinations: improve nonsense() | Felipe Contreras | 2013-05-08 | 1 | -1/+1 | |
| * | | | | | | | | | tests: at-combinations: check ref names directly | Felipe Contreras | 2013-05-08 | 1 | -16/+23 | |
| * | | | | | | | | | tests: at-combinations: simplify setup | Felipe Contreras | 2013-05-08 | 1 | -4/+2 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'ar/wildmatch-foldcase' | Junio C Hamano | 2013-06-11 | 2 | -6/+56 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | wildmatch: properly fold case everywhere | Anthony Ramine | 2013-06-02 | 2 | -6/+56 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'tr/sha1-file-silence-loose-object-info-under-prune-race' | Junio C Hamano | 2013-06-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | sha1_file: silence sha1_loose_object_info | Thomas Rast | 2013-06-03 | 1 | -1/+1 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'nd/warn-ambiguous-object-name' | Junio C Hamano | 2013-06-11 | 4 | -2/+44 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | get_sha1: warn about full or short object names that look like refs | Nguyễn Thái Ngọc Duy | 2013-05-29 | 4 | -2/+44 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'rr/diffcore-pickaxe-doc' | Junio C Hamano | 2013-06-11 | 3 | -28/+59 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | diffcore-pickaxe doc: document -S and -G properly | Ramkumar Ramachandra | 2013-06-03 | 2 | -26/+57 | |
| * | | | | | | | | | diffcore-pickaxe: make error messages more consistent | Ramkumar Ramachandra | 2013-06-03 | 1 | -2/+2 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'cr/git-work-tree-sans-git-dir' | Junio C Hamano | 2013-06-11 | 1 | -3/+1 | |
|\ \ \ \ \ \ \ \ \ |