summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mg/more-textconv'Junio C Hamano2013-10-2314-57/+237
|\
| * grep: honor --textconv for the case rev:pathmg/more-textconvMichael J Gruber2013-05-104-16/+29
| * grep: allow to use textconv filtersJeff King2013-05-105-16/+102
| * t7008: demonstrate behavior of grep with textconvMichael J Gruber2013-05-101-0/+31
| * cat-file: do not die on --textconv without textconv filtersMichael J Gruber2013-05-102-25/+13
| * show: honor --textconv for blobsMichael J Gruber2013-05-102-6/+25
| * diff_opt: track whether flags have been set explicitlyJunio C Hamano2013-05-104-3/+19
| * t4030: demonstrate behavior of show with textconvMichael J Gruber2013-05-101-0/+24
* | Merge branch 'jc/pack-objects'Junio C Hamano2013-10-231-11/+12
|\ \
| * | pack-objects: shrink struct object_entryjc/pack-objectsJunio C Hamano2013-02-041-11/+12
* | | Update draft release notes to 1.8.5Junio C Hamano2013-10-181-0/+7
* | | Merge branch 'maint'Junio C Hamano2013-10-181-1/+5
|\ \ \
| * | | git-merge: document the -S optionNicolas Vigier2013-10-181-1/+5
* | | | Merge branch 'jc/reflog-doc'Junio C Hamano2013-10-183-3/+49
|\ \ \ \
| * | | | setup_reflog_action: document the rules for using GIT_REFLOG_ACTIONjc/reflog-docJunio C Hamano2013-06-193-3/+49
* | | | | Merge branch 'sb/repack-in-c'Junio C Hamano2013-10-185-1/+391
|\ \ \ \ \
| * | | | | repack: improve warnings about failure of renaming and removing filesStefan Beller2013-09-171-2/+3
| * | | | | repack: retain the return value of pack-objectsStefan Beller2013-09-171-2/+2
| * | | | | repack: rewrite the shell script in CStefan Beller2013-09-175-1/+390
* | | | | | Merge branch 'jk/clone-progress-to-stderr'Junio C Hamano2013-10-184-28/+32
|\ \ \ \ \ \
| * | | | | | clone: always set transport optionsjk/clone-progress-to-stderrJeff King2013-09-182-16/+18
| * | | | | | clone: treat "checking connectivity" like other progressJeff King2013-09-182-3/+4
| * | | | | | clone: send diagnostic messages to stderrJeff King2013-09-183-10/+11
* | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2013-10-181-2367/+3193
|\ \ \ \ \ \ \
| * | | | | | | l10n: fr.po: 2135/2135 messages translatedJean-Noel Avila2013-10-181-2367/+3193
* | | | | | | | Update draft release notes to 1.8.5Junio C Hamano2013-10-171-0/+4
* | | | | | | | Merge branch 'jk/format-patch-from'Junio C Hamano2013-10-174-1/+49
|\ \ \ \ \ \ \ \
| * | | | | | | | format-patch: print in-body "From" only when neededjk/format-patch-fromJeff King2013-09-204-1/+49
* | | | | | | | | Merge branch 'es/name-hash-no-trailing-slash-in-dirs'Junio C Hamano2013-10-175-51/+50
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | dir: revert work-around for retired dangerous behaviores/name-hash-no-trailing-slash-in-dirsEric Sunshine2013-09-171-15/+3
| * | | | | | | | | name-hash: stop storing trailing '/' on paths in index_state.dir_hashEric Sunshine2013-09-173-7/+8
| * | | | | | | | | employ new explicit "exists in index?" APIEric Sunshine2013-09-173-9/+9
| * | | | | | | | | name-hash: refactor polymorphic index_name_exists()Eric Sunshine2013-09-172-24/+34
* | | | | | | | | | Merge branch 'jk/trailing-slash-in-pathspec'Junio C Hamano2013-10-173-20/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | reset: handle submodule with trailing slashjk/trailing-slash-in-pathspecJohn Keeping2013-09-132-4/+10
| * | | | | | | | | | rm: re-use parse_pathspec's trailing-slash removalJohn Keeping2013-09-131-16/+4
* | | | | | | | | | | Merge branch 'lc/filter-branch-too-many-refs'Junio C Hamano2013-10-171-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Allow git-filter-branch to process large repositories with lots of branches.lc/filter-branch-too-many-refsLee Carver2013-09-121-2/+2
* | | | | | | | | | | | Merge branch 'jc/checkout-detach-doc'Junio C Hamano2013-10-171-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | checkout: update synopsys and documentation on detaching HEADjc/checkout-detach-docJunio C Hamano2013-09-111-6/+8
| |/ / / / / / / / / / /
* | | | | | | | | | | | Sync with maintJunio C Hamano2013-10-172-21/+65
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Start preparing for 1.8.4.2Junio C Hamano2013-10-172-1/+51
| * | | | | | | | | | Merge branch 'jk/upload-pack-keepalive' into maintJunio C Hamano2013-10-172-1/+35
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/http-backend-allow-405' into maintJunio C Hamano2013-10-171-2/+4
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/cvsserver-perm-bit-fix' into maintJunio C Hamano2013-10-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/add-i-mingw' into maintJunio C Hamano2013-10-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/git-dir-pointing-at-gitfile' into maintJunio C Hamano2013-10-172-5/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/has-sha1-file-retry-packed' into maintJunio C Hamano2013-10-171-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ap/commit-author-mailmap' into maintJunio C Hamano2013-10-172-1/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'es/rebase-i-no-abbrev' into maintJunio C Hamano2013-10-172-2/+117
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \