aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'bc/blame-crlf-test'Junio C Hamano2014-06-06
|\
| * blame: correctly handle files regardless of autocrlfbrian m. carlson2014-05-08
* | Merge branch 'sk/submodules-absolute-path-on-windows'Junio C Hamano2014-06-06
|\ \
| * | Revert "submodules: fix ambiguous absolute paths under Windows"Stepan Kasal2014-05-08
* | | Merge branch 'dk/blame-reorg'Junio C Hamano2014-06-06
|\ \ \
| * | | blame: large-scale performance rewriteDavid Kastrup2014-04-28
* | | | Merge branch 'wg/svn-fe-style-fixes'Junio C Hamano2014-06-06
|\ \ \ \
| * | | | svn-fe: conform to pep8William Giokas2014-05-12
* | | | | Merge branch 'jn/contrib-remove-vim'Junio C Hamano2014-06-06
|\ \ \ \ \
| * | | | | contrib: remove vim support instructionsJonathan Nieder2014-05-09
| |/ / / /
* | | | | Merge branch 'jn/contrib-remove-diffall'Junio C Hamano2014-06-06
|\ \ \ \ \
| * | | | | contrib: remove git-diffallJonathan Nieder2014-05-09
| |/ / / /
* | | | | Merge branch 'dt/merge-recursive-case-insensitive'Junio C Hamano2014-06-06
|\ \ \ \ \
| * | | | | mv: allow renaming to fix case on case insensitive filesystemsDavid Turner2014-05-08
| * | | | | merge-recursive.c: fix case-changing merge bugDavid Turner2014-05-07
* | | | | | Merge branch 'rs/reflog-exists'Junio C Hamano2014-06-06
|\ \ \ \ \ \
| * | | | | | checkout.c: use ref_exists instead of file_existRonnie Sahlberg2014-05-08
| * | | | | | refs.c: add new functions reflog_exists and delete_reflogRonnie Sahlberg2014-05-08
* | | | | | | Merge branch 'tg/tag-state-tag-name-in-editor-hints'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \
| * | | | | | | builtin/tag.c: show tag name to hint in the message editorThorsten Glaser2014-05-07
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/grep-tell-run-command-to-cd-when-running-pager'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \
| * | | | | | | grep: use run-command's "dir" option for --open-files-in-pagerJeff King2014-05-07
| |/ / / / / /
* | | | | | | Merge branch 'fc/status-printf-squelch-format-zero-length-warnings'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \
| * | | | | | | silence a bunch of format-zero-length warningsFelipe Contreras2014-05-07
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jk/squelch-compiler-warning-from-funny-error-macro'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \
| * | | | | | | let clang use the constant-return error() macroJeff King2014-05-06
| * | | | | | | inline constant return from error() functionJeff King2014-05-06
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'dk/raise-core-deltabasecachelimit'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \
| * | | | | | | Bump core.deltaBaseCacheLimit to 96mDavid Kastrup2014-05-06
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'tl/relax-in-poll-emulation'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \
| * | | | | | | compat/poll: sleep 1 millisecond to avoid busy waitTheodore Leblond2014-04-29
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/utf8-switch-between-nfd-and-nfc'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \
| * | | | | | | t3910: show failure of core.precomposeunicode with decomposed filenamesJeff King2014-04-29
| |/ / / / / /
* | | | | | | Merge branch 'da/imap-send-use-credential-helper'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \
| * | | | | | | imap-send: use git-credentialDan Albert2014-04-29
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'je/pager-do-not-recurse'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \
| * | | | | | | pager: do allow spawning pager recursivelyJörn Engel2014-04-28
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/commit-C-pick-empty'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \
| * | | | | | | commit: do not complain of empty messages from -CJeff King2014-04-28
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'mm/pager-less-sans-S'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \
| * | | | | | | pager: remove 'S' from $LESS by defaultMatthieu Moy2014-05-07
* | | | | | | | First batch for 2.1Junio C Hamano2014-06-03
* | | | | | | | Merge branch 'sk/msvc-dynlink-crt'Junio C Hamano2014-06-03
|\ \ \ \ \ \ \ \
| * | | | | | | | MSVC: link dynamically to the CRTKarsten Blees2014-05-06
* | | | | | | | | Merge branch 'ew/config-protect-mode'Junio C Hamano2014-06-03
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | config: preserve config file permissions on editsEric Wong2014-05-06
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bg/strbuf-trim'Junio C Hamano2014-06-03
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | api-strbuf.txt: add docs for _trim and _ltrimBrian Gesiak2014-05-06
| * | | | | | | | | strbuf: use _rtrim and _ltrim in strbuf_trimBrian Gesiak2014-05-06
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/commit-date-approxidate'Junio C Hamano2014-06-03
|\ \ \ \ \ \ \ \ \