Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | gpg-interface: provide clear helper for struct signature_check | Michael J Gruber | 2014-06-23 | 1 | -4/+1 |
* | Merge branch 'nd/status-auto-comment-char' | Junio C Hamano | 2014-06-06 | 1 | -0/+32 |
|\ | |||||
| * | commit: allow core.commentChar=auto for character auto selectionnd/status-auto-comment-char | Nguyễn Thái Ngọc Duy | 2014-05-19 | 1 | -0/+32 |
* | | Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' | Junio C Hamano | 2014-06-06 | 1 | -0/+3 |
|\ \ | |||||
| * | | git grep -O -i: if the pager is 'less', pass the '-I' optionsk/spawn-less-case-insensitively-from-grep-O-i | Johannes Schindelin | 2014-05-15 | 1 | -0/+3 |
* | | | Merge branch 'jk/index-pack-report-missing' | Junio C Hamano | 2014-06-06 | 1 | -2/+7 |
|\ \ \ | |||||
| * | | | index-pack: distinguish missing objects from type errorsjk/index-pack-report-missing | Jeff King | 2014-05-12 | 1 | -2/+7 |
* | | | | Merge branch 'bc/blame-crlf-test' | Junio C Hamano | 2014-06-06 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * | | | | blame: correctly handle files regardless of autocrlfbc/blame-crlf-test | brian m. carlson | 2014-05-08 | 1 | -1/+0 |
* | | | | | Merge branch 'dk/blame-reorg' | Junio C Hamano | 2014-06-06 | 1 | -298/+567 |
|\ \ \ \ \ | |||||
| * | | | | | blame: large-scale performance rewritedk/blame-reorg | David Kastrup | 2014-04-28 | 1 | -298/+567 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'dt/merge-recursive-case-insensitive' | Junio C Hamano | 2014-06-06 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | mv: allow renaming to fix case on case insensitive filesystemsdt/merge-recursive-case-insensitive | David Turner | 2014-05-08 | 1 | -1/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'rs/reflog-exists' | Junio C Hamano | 2014-06-06 | 2 | -7/+3 |
|\ \ \ \ \ | |||||
| * | | | | | checkout.c: use ref_exists instead of file_existrs/reflog-exists | Ronnie Sahlberg | 2014-05-08 | 1 | -4/+1 |
| * | | | | | refs.c: add new functions reflog_exists and delete_reflog | Ronnie Sahlberg | 2014-05-08 | 2 | -5/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'tg/tag-state-tag-name-in-editor-hints' | Junio C Hamano | 2014-06-06 | 1 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | builtin/tag.c: show tag name to hint in the message editortg/tag-state-tag-name-in-editor-hints | Thorsten Glaser | 2014-05-07 | 1 | -4/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'jk/grep-tell-run-command-to-cd-when-running-pager' | Junio C Hamano | 2014-06-06 | 1 | -3/+1 |
|\ \ \ \ \ | |||||
| * | | | | | grep: use run-command's "dir" option for --open-files-in-pagerjk/grep-tell-run-command-to-cd-when-running-pager | Jeff King | 2014-05-07 | 1 | -3/+1 |
| |/ / / / | |||||
| * | | | | Merge branch 'jl/nor-or-nand-and' into maint | Junio C Hamano | 2014-04-09 | 6 | -8/+8 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'mh/update-ref-batch-create-fix' into maint | Junio C Hamano | 2014-04-09 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'bp/commit-p-editor' into maint | Junio C Hamano | 2014-04-08 | 5 | -17/+38 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/mv-submodules-fix' into maint | Junio C Hamano | 2014-04-03 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'nd/index-pack-error-message' into maint | Junio C Hamano | 2014-04-03 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/shallow-update-fix' into maint | Junio C Hamano | 2014-04-03 | 1 | -12/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | Merge branch 'fc/status-printf-squelch-format-zero-length-warnings' | Junio C Hamano | 2014-06-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | silence a bunch of format-zero-length warningsfc/status-printf-squelch-format-zero-length-warnings | Felipe Contreras | 2014-05-07 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/commit-C-pick-empty' | Junio C Hamano | 2014-06-06 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | commit: do not complain of empty messages from -Cjk/commit-C-pick-empty | Jeff King | 2014-04-28 | 1 | -3/+2 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'jk/commit-date-approxidate' | Junio C Hamano | 2014-06-03 | 1 | -19/+60 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | commit: accept more date formats for "--date" | Jeff King | 2014-05-02 | 1 | -2/+25 |
| * | | | | | | | | | | | commit: print "Date" line when the user has set date | Jeff King | 2014-05-02 | 1 | -0/+19 |
| * | | | | | | | | | | | commit: use split_ident_line to compare author/committer | Jeff King | 2014-05-02 | 1 | -17/+16 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'fc/rerere-conflict-style' | Junio C Hamano | 2014-06-03 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | rerere: fix for merge.conflictstylefc/rerere-conflict-style | Felipe Contreras | 2014-04-30 | 1 | -0/+2 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'sk/tag-contains-wo-recursion' | Junio C Hamano | 2014-06-03 | 1 | -15/+75 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git tag --contains: avoid stack overflow | Jean-Jacques Lafay | 2014-04-25 | 1 | -15/+75 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jx/blame-align-relative-time' | Junio C Hamano | 2014-06-03 | 1 | -8/+22 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | blame: dynamic blame_date_width for different localesjx/blame-align-relative-time | Jiang Xin | 2014-04-23 | 1 | -1/+8 |
| * | | | | | | | | | | | blame: fix broken time_buf paddings in relative timestamp | Jiang Xin | 2014-04-23 | 1 | -7/+14 |
* | | | | | | | | | | | | Merge branch 'fc/merge-default-to-upstream' | Junio C Hamano | 2014-06-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | merge: enable defaulttoupstream by defaultfc/merge-default-to-upstream | Felipe Contreras | 2014-04-22 | 1 | -1/+1 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'rs/ref-update-check-errors-early' | Junio C Hamano | 2014-06-03 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | commit.c: check for lock error and return earlyrs/ref-update-check-errors-early | Ronnie Sahlberg | 2014-04-17 | 1 | -4/+4 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'nd/index-pack-one-fd-per-thread' | Junio C Hamano | 2014-06-03 | 1 | -10/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | index-pack: work around thread-unsafe pread()nd/index-pack-one-fd-per-thread | Nguyễn Thái Ngọc Duy | 2014-04-16 | 1 | -10/+17 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'ym/fix-opportunistic-index-update-race' | Junio C Hamano | 2014-06-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | wrapper.c: add xpread() similar to xread() | Yiannis Marangos | 2014-04-10 | 1 | -1/+1 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'mh/ref-transaction' | Junio C Hamano | 2014-06-03 | 6 | -178/+277 |
|\ \ \ \ \ \ \ \ \ \ \ \ |