Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Git 1.8.2.2v1.8.2.2 | Junio C Hamano | 2013-04-26 | 3 | -2/+21 |
* | Merge branch 'jk/a-thread-only-dies-once' into maint | Junio C Hamano | 2013-04-26 | 3 | -6/+26 |
|\ | |||||
| * | run-command: use thread-aware die_is_recursing routine | Jeff King | 2013-04-17 | 1 | -0/+11 |
| * | usage: allow pluggable die-recursion checks | Jeff King | 2013-04-17 | 2 | -6/+15 |
* | | Merge branch 'jn/gitweb-install-doc' into maint | Junio C Hamano | 2013-04-26 | 2 | -8/+12 |
|\ \ | |||||
| * | | gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility | Jonathan Nieder | 2013-04-18 | 1 | -0/+7 |
| * | | gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM | Jakub Narębski | 2013-04-15 | 1 | -8/+5 |
* | | | Merge branch 'fc/untracked-zsh-prompt' into maint | Junio C Hamano | 2013-04-26 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | prompt: fix untracked files for zsh | Felipe Contreras | 2013-04-22 | 1 | -1/+1 |
* | | | | Merge branch 'jk/receive-pack-deadlocks-with-early-failure' into maint | Junio C Hamano | 2013-04-26 | 1 | -1/+4 |
|\ \ \ \ | |||||
| * | | | | receive-pack: close sideband fd on early pack errors | Jeff King | 2013-04-19 | 1 | -1/+4 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'jk/chopped-ident' into maint | Junio C Hamano | 2013-04-26 | 5 | -99/+75 |
|\ \ \ \ | |||||
| * | | | | blame: handle broken commit headers gracefully | René Scharfe | 2013-04-17 | 1 | -3/+8 |
| * | | | | pretty: handle broken commit headers gracefully | René Scharfe | 2013-04-17 | 2 | -21/+66 |
| * | | | | cat-file: print tags raw for "cat-file -p" | Jeff King | 2013-04-17 | 2 | -75/+1 |
* | | | | | Merge branch 'rt/commentchar-fmt-merge-msg' into maint | Junio C Hamano | 2013-04-26 | 2 | -7/+29 |
|\ \ \ \ \ | |||||
| * | | | | | t6200: avoid path mangling issue on Windows | Johannes Sixt | 2013-04-18 | 1 | -3/+3 |
| * | | | | | fmt-merge-msg: use core.commentchar in tag signatures completely | Ralf Thielow | 2013-04-07 | 1 | -4/+8 |
| * | | | | | fmt-merge-msg: respect core.commentchar in people credits | Ralf Thielow | 2013-04-07 | 2 | -3/+21 |
* | | | | | | Merge branch 'rs/empty-archive' into maint | Junio C Hamano | 2013-04-26 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t5004: fix issue with empty archive test and bsdtar | René Scharfe | 2013-04-10 | 1 | -1/+1 |
* | | | | | | | Merge branch 'pe/pull-rebase-v-q' into maint | Junio C Hamano | 2013-04-26 | 2 | -1/+28 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | pull: Apply -q and -v options to rebase mode as well | Peter Eisentraut | 2013-03-17 | 2 | -1/+28 |
* | | | | | | | | t7409: do not use export X=Y | Torsten Bögershausen | 2013-04-26 | 1 | -4/+10 |
* | | | | | | | | test-hg-hg-git.sh: do not use export X=Y | Torsten Bögershausen | 2013-04-26 | 1 | -4/+6 |
* | | | | | | | | test-hg-bidi.sh: do not use export X=Y | Torsten Bögershausen | 2013-04-26 | 1 | -5/+6 |
* | | | | | | | | t9501: do not use export X=Y | Torsten Bögershausen | 2013-04-26 | 1 | -5/+10 |
* | | | | | | | | t9020: do not use export X=Y | Torsten Bögershausen | 2013-04-26 | 1 | -1/+2 |
* | | | | | | | | Update draft release notes to 1.8.2.2 | Junio C Hamano | 2013-04-25 | 1 | -0/+18 |
* | | | | | | | | Merge branch 'jk/diff-algo-finishing-touches' into maint | Junio C Hamano | 2013-04-25 | 2 | -2/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diff: allow unstuck arguments with --diff-algorithm | John Keeping | 2013-04-05 | 1 | -2/+3 |
| * | | | | | | | | git-merge(1): document diff-algorithm option to merge-recursive | John Keeping | 2013-04-05 | 1 | -0/+6 |
* | | | | | | | | | Merge branch 'sr/log-SG-no-textconv' into maint | Junio C Hamano | 2013-04-25 | 2 | -72/+86 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | diffcore-pickaxe: unify code for log -S/-G | Jeff King | 2013-04-05 | 1 | -69/+49 |
| * | | | | | | | | | diffcore-pickaxe: fix leaks in "log -S<block>" and "log -G<pattern>" | Junio C Hamano | 2013-04-05 | 1 | -5/+7 |
| * | | | | | | | | | diffcore-pickaxe: port optimization from has_changes() to diff_grep() | Junio C Hamano | 2013-04-05 | 1 | -1/+6 |
| * | | | | | | | | | diffcore-pickaxe: respect --no-textconv | Simon Ruderich | 2013-04-05 | 2 | -4/+36 |
| * | | | | | | | | | diffcore-pickaxe: remove fill_one() | Jeff King | 2013-04-05 | 1 | -20/+10 |
| * | | | | | | | | | diffcore-pickaxe: remove unnecessary call to get_textconv() | Simon Ruderich | 2013-04-05 | 1 | -9/+14 |
* | | | | | | | | | | Merge branch 'jc/merge-tag-object' into maint | Junio C Hamano | 2013-04-25 | 2 | -32/+81 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t6200: test message for merging of an annotated tag | Junio C Hamano | 2013-04-01 | 1 | -0/+39 |
| * | | | | | | | | | | t6200: use test_config/test_unconfig | Junio C Hamano | 2013-04-01 | 1 | -32/+29 |
| * | | | | | | | | | | merge: a random object may not necssarily be a commit | Junio C Hamano | 2013-03-19 | 1 | -0/+13 |
* | | | | | | | | | | | completion: remove duplicate block for "git commit -c" | Mårten Kongstad | 2013-04-25 | 1 | -7/+0 |
* | | | | | | | | | | | cherry-pick/revert: make usage say '<commit-ish>...' | Kevin Bracey | 2013-04-24 | 1 | -2/+2 |
* | | | | | | | | | | | Start preparing for 1.8.2.2 | Junio C Hamano | 2013-04-22 | 2 | -1/+26 |
* | | | | | | | | | | | Merge branch 'ta/glossary' into maint | Junio C Hamano | 2013-04-22 | 32 | -111/+89 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | glossary: improve definitions of refspec and pathspec | Thomas Ackermann | 2013-04-15 | 1 | -23/+10 |
| * | | | | | | | | | | | The name of the hash function is "SHA-1", not "SHA1" | Thomas Ackermann | 2013-04-15 | 31 | -68/+68 |
| * | | | | | | | | | | | glossary: improve description of SHA-1 related topics | Thomas Ackermann | 2013-04-15 | 1 | -10/+10 |