summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | t6019: test file dropped in -s ours mergeKevin Bracey2013-05-161-0/+19
| * | | | decorate.c: compact table when growingKevin Bracey2013-05-161-1/+1
* | | | | Merge branch 'rr/remove-contrib-some'Junio C Hamano2013-06-145-792/+0
|\ \ \ \ \
| * | | | | contrib: drop blameview/ directoryJeff King2013-06-122-164/+0
| * | | | | contrib: remove continuous/ and patches/Ramkumar Ramachandra2013-06-033-628/+0
| | |_|/ / | |/| | |
* | | | | Fix `git svn` `rebase` & `dcommit` if top-level HEAD directory existSlava Kardakov2013-06-121-2/+2
* | | | | Merge branch 'maint'Junio C Hamano2013-06-112-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'maint-1.8.2' into maintJunio C Hamano2013-06-112-1/+1
| |\ \ \ \ \
| | * | | | | t0070 "mktemp to unwritable directory" needs SANITYTorsten Bögershausen2013-06-111-1/+1
| | * | | | | pre-push.sample: Make the script executableWieland Hoffmann2013-06-111-0/+0
| | | |_|_|/ | | |/| | |
* | | | | | Update draft release notesJunio C Hamano2013-06-111-1/+48
* | | | | | Merge branch 'cm/gitweb-project-list-persistent-cgi-fix'Junio C Hamano2013-06-111-1/+1
|\ \ \ \ \ \
| * | | | | | gitweb: fix problem causing erroneous project listCharles McGarvey2013-06-071-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'rr/maint-fetch-tag-doc-asterisks'Junio C Hamano2013-06-111-1/+1
|\ \ \ \ \ \
| * | | | | | fetch-options.txt: prevent a wildcard refspec from getting misformattedJunio C Hamano2013-06-071-1/+1
* | | | | | | Merge branch 'rr/rebase-autostash'Junio C Hamano2013-06-118-16/+235
|\ \ \ \ \ \ \
| * | | | | | | rebase: implement --[no-]autostash and rebase.autostashRamkumar Ramachandra2013-05-294-3/+208
| * | | | | | | rebase --merge: return control to caller, for housekeepingRamkumar Ramachandra2013-05-131-3/+2
| * | | | | | | rebase -i: return control to caller, for housekeepingRamkumar Ramachandra2013-05-131-4/+5
| * | | | | | | am: return control to caller, for housekeepingRamkumar Ramachandra2013-05-132-6/+11
| * | | | | | | rebase: prepare to do generic housekeepingRamkumar Ramachandra2013-05-131-0/+7
| * | | | | | | rebase -i: don't error out if $state_dir already existsRamkumar Ramachandra2013-05-131-1/+1
| * | | | | | | am: tighten a conditional that checks for $dotestRamkumar Ramachandra2013-05-131-1/+3
* | | | | | | | Merge branch 'jk/test-exit-code-by-signal'Junio C Hamano2013-06-111-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | t0005: skip signal death exit code test on WindowsJohannes Sixt2013-06-061-1/+1
| * | | | | | | | t0005: test git exit code from signal deathJeff King2013-06-021-0/+7
* | | | | | | | | Merge branch 'fc/at-head'Junio C Hamano2013-06-115-57/+123
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sha1_name: compare variable with constant, not constant with variableFelipe Contreras2013-05-081-5/+7
| * | | | | | | | | Add new @ shortcut for HEADFelipe Contreras2013-05-085-0/+28
| * | | | | | | | | sha1_name: refactor reinterpret()Felipe Contreras2013-05-081-19/+23
| * | | | | | | | | sha1_name: check @{-N} errors soonerRamkumar Ramachandra2013-05-081-5/+4
| * | | | | | | | | sha1_name: reorganize get_sha1_basic()Felipe Contreras2013-05-081-11/+19
| * | | | | | | | | sha1_name: don't waste cycles in the @-parsing loopRamkumar Ramachandra2013-05-081-1/+1
| * | | | | | | | | sha1_name: remove unnecessary bracesFelipe Contreras2013-05-081-3/+2
| * | | | | | | | | sha1_name: remove no-opFelipe Contreras2013-05-081-1/+1
| * | | | | | | | | tests: at-combinations: @{N} versus HEAD@{N}Ramkumar Ramachandra2013-05-081-0/+13
| * | | | | | | | | tests: at-combinations: increase coverageRamkumar Ramachandra2013-05-081-0/+8
| * | | | | | | | | tests: at-combinations: improve nonsense()Felipe Contreras2013-05-081-1/+1
| * | | | | | | | | tests: at-combinations: check ref names directlyFelipe Contreras2013-05-081-16/+23
| * | | | | | | | | tests: at-combinations: simplify setupFelipe Contreras2013-05-081-4/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ar/wildmatch-foldcase'Junio C Hamano2013-06-112-6/+56
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | wildmatch: properly fold case everywhereAnthony Ramine2013-06-022-6/+56
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'tr/sha1-file-silence-loose-object-info-under-prune-race'Junio C Hamano2013-06-111-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sha1_file: silence sha1_loose_object_infoThomas Rast2013-06-031-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'nd/warn-ambiguous-object-name'Junio C Hamano2013-06-114-2/+44
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | get_sha1: warn about full or short object names that look like refsNguyễn Thái Ngọc Duy2013-05-294-2/+44
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rr/diffcore-pickaxe-doc'Junio C Hamano2013-06-113-28/+59
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diffcore-pickaxe doc: document -S and -G properlyRamkumar Ramachandra2013-06-032-26/+57
| * | | | | | | | | diffcore-pickaxe: make error messages more consistentRamkumar Ramachandra2013-06-031-2/+2
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'cr/git-work-tree-sans-git-dir'Junio C Hamano2013-06-111-3/+1
|\ \ \ \ \ \ \ \ \