Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mg/more-textconv' | Junio C Hamano | 2013-10-23 | 14 | -57/+237 |
|\ | |||||
| * | grep: honor --textconv for the case rev:pathmg/more-textconv | Michael J Gruber | 2013-05-10 | 4 | -16/+29 |
| * | grep: allow to use textconv filters | Jeff King | 2013-05-10 | 5 | -16/+102 |
| * | t7008: demonstrate behavior of grep with textconv | Michael J Gruber | 2013-05-10 | 1 | -0/+31 |
| * | cat-file: do not die on --textconv without textconv filters | Michael J Gruber | 2013-05-10 | 2 | -25/+13 |
| * | show: honor --textconv for blobs | Michael J Gruber | 2013-05-10 | 2 | -6/+25 |
| * | diff_opt: track whether flags have been set explicitly | Junio C Hamano | 2013-05-10 | 4 | -3/+19 |
| * | t4030: demonstrate behavior of show with textconv | Michael J Gruber | 2013-05-10 | 1 | -0/+24 |
* | | Merge branch 'jc/pack-objects' | Junio C Hamano | 2013-10-23 | 1 | -11/+12 |
|\ \ | |||||
| * | | pack-objects: shrink struct object_entryjc/pack-objects | Junio C Hamano | 2013-02-04 | 1 | -11/+12 |
* | | | Update draft release notes to 1.8.5 | Junio C Hamano | 2013-10-18 | 1 | -0/+7 |
* | | | Merge branch 'maint' | Junio C Hamano | 2013-10-18 | 1 | -1/+5 |
|\ \ \ | |||||
| * | | | git-merge: document the -S option | Nicolas Vigier | 2013-10-18 | 1 | -1/+5 |
* | | | | Merge branch 'jc/reflog-doc' | Junio C Hamano | 2013-10-18 | 3 | -3/+49 |
|\ \ \ \ | |||||
| * | | | | setup_reflog_action: document the rules for using GIT_REFLOG_ACTIONjc/reflog-doc | Junio C Hamano | 2013-06-19 | 3 | -3/+49 |
* | | | | | Merge branch 'sb/repack-in-c' | Junio C Hamano | 2013-10-18 | 5 | -1/+391 |
|\ \ \ \ \ | |||||
| * | | | | | repack: improve warnings about failure of renaming and removing files | Stefan Beller | 2013-09-17 | 1 | -2/+3 |
| * | | | | | repack: retain the return value of pack-objects | Stefan Beller | 2013-09-17 | 1 | -2/+2 |
| * | | | | | repack: rewrite the shell script in C | Stefan Beller | 2013-09-17 | 5 | -1/+390 |
* | | | | | | Merge branch 'jk/clone-progress-to-stderr' | Junio C Hamano | 2013-10-18 | 4 | -28/+32 |
|\ \ \ \ \ \ | |||||
| * | | | | | | clone: always set transport optionsjk/clone-progress-to-stderr | Jeff King | 2013-09-18 | 2 | -16/+18 |
| * | | | | | | clone: treat "checking connectivity" like other progress | Jeff King | 2013-09-18 | 2 | -3/+4 |
| * | | | | | | clone: send diagnostic messages to stderr | Jeff King | 2013-09-18 | 3 | -10/+11 |
* | | | | | | | Merge git://github.com/git-l10n/git-po | Junio C Hamano | 2013-10-18 | 1 | -2367/+3193 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | l10n: fr.po: 2135/2135 messages translated | Jean-Noel Avila | 2013-10-18 | 1 | -2367/+3193 |
* | | | | | | | | Update draft release notes to 1.8.5 | Junio C Hamano | 2013-10-17 | 1 | -0/+4 |
* | | | | | | | | Merge branch 'jk/format-patch-from' | Junio C Hamano | 2013-10-17 | 4 | -1/+49 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | format-patch: print in-body "From" only when neededjk/format-patch-from | Jeff King | 2013-09-20 | 4 | -1/+49 |
* | | | | | | | | | Merge branch 'es/name-hash-no-trailing-slash-in-dirs' | Junio C Hamano | 2013-10-17 | 5 | -51/+50 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | dir: revert work-around for retired dangerous behaviores/name-hash-no-trailing-slash-in-dirs | Eric Sunshine | 2013-09-17 | 1 | -15/+3 |
| * | | | | | | | | | name-hash: stop storing trailing '/' on paths in index_state.dir_hash | Eric Sunshine | 2013-09-17 | 3 | -7/+8 |
| * | | | | | | | | | employ new explicit "exists in index?" API | Eric Sunshine | 2013-09-17 | 3 | -9/+9 |
| * | | | | | | | | | name-hash: refactor polymorphic index_name_exists() | Eric Sunshine | 2013-09-17 | 2 | -24/+34 |
* | | | | | | | | | | Merge branch 'jk/trailing-slash-in-pathspec' | Junio C Hamano | 2013-10-17 | 3 | -20/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | reset: handle submodule with trailing slashjk/trailing-slash-in-pathspec | John Keeping | 2013-09-13 | 2 | -4/+10 |
| * | | | | | | | | | | rm: re-use parse_pathspec's trailing-slash removal | John Keeping | 2013-09-13 | 1 | -16/+4 |
* | | | | | | | | | | | Merge branch 'lc/filter-branch-too-many-refs' | Junio C Hamano | 2013-10-17 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Allow git-filter-branch to process large repositories with lots of branches.lc/filter-branch-too-many-refs | Lee Carver | 2013-09-12 | 1 | -2/+2 |
* | | | | | | | | | | | | Merge branch 'jc/checkout-detach-doc' | Junio C Hamano | 2013-10-17 | 1 | -6/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | checkout: update synopsys and documentation on detaching HEADjc/checkout-detach-doc | Junio C Hamano | 2013-09-11 | 1 | -6/+8 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2013-10-17 | 2 | -21/+65 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Start preparing for 1.8.4.2 | Junio C Hamano | 2013-10-17 | 2 | -1/+51 |
| * | | | | | | | | | | Merge branch 'jk/upload-pack-keepalive' into maint | Junio C Hamano | 2013-10-17 | 2 | -1/+35 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/http-backend-allow-405' into maint | Junio C Hamano | 2013-10-17 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/cvsserver-perm-bit-fix' into maint | Junio C Hamano | 2013-10-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/add-i-mingw' into maint | Junio C Hamano | 2013-10-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/git-dir-pointing-at-gitfile' into maint | Junio C Hamano | 2013-10-17 | 2 | -5/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/has-sha1-file-retry-packed' into maint | Junio C Hamano | 2013-10-17 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ap/commit-author-mailmap' into maint | Junio C Hamano | 2013-10-17 | 2 | -1/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'es/rebase-i-no-abbrev' into maint | Junio C Hamano | 2013-10-17 | 2 | -2/+117 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |