Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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-04 | 1 | -20/+10 |
* | diffcore-pickaxe: remove unnecessary call to get_textconv() | Simon Ruderich | 2013-04-04 | 1 | -9/+14 |
* | pickaxe: use textconv for -S counting | Jeff King | 2012-10-28 | 2 | -17/+51 |
* | pickaxe: hoist empty needle check | Jeff King | 2012-10-28 | 1 | -2/+3 |
* | diff_grep: use textconv buffers for add/deleted files | Jeff King | 2012-10-28 | 2 | -2/+14 |
* | Git 1.7.12.4v1.7.12.4maint-1.7.12 | Junio C Hamano | 2012-10-17 | 4 | -3/+27 |
* | Merge branch 'jk/maint-http-half-auth-push' into maint | Junio C Hamano | 2012-10-17 | 3 | -6/+6 |
|\ | |||||
| * | http: fix segfault in handle_curl_result | Jeff King | 2012-10-12 | 3 | -6/+6 |
* | | Merge branch 'rr/git-uri-doc' into maint | Junio C Hamano | 2012-10-17 | 1 | -2/+6 |
|\ \ | |||||
| * | | Git url doc: mark ftp/ftps as read-only and deprecate them | Ramkumar Ramachandra | 2012-10-08 | 1 | -2/+6 |
* | | | Merge branch 'bw/cp-a-is-gnuism' into maint | Junio C Hamano | 2012-10-17 | 3 | -3/+3 |
|\ \ \ | |||||
| * | | | tests: "cp -a" is a GNUism | Ben Walton | 2012-10-08 | 3 | -3/+3 |
| |/ / | |||||
* | | | Merge branch 'nd/doc-ignore' into maint | Junio C Hamano | 2012-10-17 | 1 | -1/+5 |
|\ \ \ | |||||
| * | | | gitignore.txt: suggestions how to get literal # or ! at the beginning | Nguyễn Thái Ngọc Duy | 2012-10-07 | 1 | -1/+5 |
* | | | | Merge branch 'jc/doc-long-options' into maint | Junio C Hamano | 2012-10-17 | 1 | -1/+11 |
|\ \ \ \ | |||||
| * | | | | gitcli: parse-options lets you omit tail of long options | Junio C Hamano | 2012-10-04 | 1 | -1/+11 |
* | | | | | Merge branch 'jc/maint-t1450-fsck-order-fix' into maint | Junio C Hamano | 2012-10-17 | 1 | -3/+1 |
|\ \ \ \ \ | |||||
| * | | | | | t1450: the order the objects are checked is undefined | Junio C Hamano | 2012-10-02 | 1 | -3/+1 |
* | | | | | | Merge branch 'rr/test-use-shell-path-not-shell' into maint | Junio C Hamano | 2012-10-17 | 1 | -16/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | test-lib: use $SHELL_PATH, not $SHELL | Ramkumar Ramachandra | 2012-09-25 | 1 | -16/+16 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'rr/test-make-sure-we-have-git' into maint | Junio C Hamano | 2012-10-17 | 2 | -10/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t/test-lib: make sure Git has already been built | Ramkumar Ramachandra | 2012-09-18 | 2 | -10/+9 |
* | | | | | | | Merge branch 'po/maint-docs' into maint | Junio C Hamano | 2012-10-17 | 5 | -15/+28 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Doc branch: show -vv option and alternative | Philip Oakley | 2012-09-19 | 1 | -1/+3 |
| * | | | | | | | Doc clean: add See Also link | Philip Oakley | 2012-09-18 | 1 | -0/+4 |
| * | | | | | | | Doc add: link gitignore | Philip Oakley | 2012-09-18 | 1 | -1/+1 |
| * | | | | | | | Doc: separate gitignore pattern sources | Philip Oakley | 2012-09-18 | 1 | -12/+18 |
| * | | | | | | | Doc: shallow clone deepens _to_ new depth | Philip Oakley | 2012-09-18 | 1 | -1/+2 |
* | | | | | | | | Merge branch 'jc/ll-merge-binary-ours' into maint | Junio C Hamano | 2012-10-17 | 5 | -12/+41 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | ll-merge: warn about inability to merge binary files only when we can't | Junio C Hamano | 2012-09-12 | 1 | -3/+4 |
| * | | | | | | | | attr: "binary" attribute should choose built-in "binary" merge driver | Junio C Hamano | 2012-09-08 | 3 | -3/+3 |
| * | | | | | | | | merge: teach -Xours/-Xtheirs to binary ll-merge driver | Junio C Hamano | 2012-09-08 | 3 | -7/+35 |
* | | | | | | | | | Merge branch 'db/doc-custom-xmlto' into maint | Junio C Hamano | 2012-10-17 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation/Makefile: Allow custom XMLTO binary | Dave Borowitz | 2012-09-19 | 1 | -2/+3 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Fix spelling error in post-receive-email hook | Richard Fearn | 2012-10-13 | 1 | -1/+1 |
* | | | | | | | | | gitweb.cgi: fix "comitter_tz" typo in feed | Dylan Alex Simon | 2012-10-12 | 1 | -1/+1 |
* | | | | | | | | | attr: a note about the order of .gitattributes lookup | Nguyen Thai Ngoc Duy | 2012-10-10 | 1 | -0/+5 |
* | | | | | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maint | Junio C Hamano | 2012-10-09 | 1 | -7/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | l10n: de.po: fix a few minor typos | Simon Ruderich | 2012-10-04 | 1 | -7/+7 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Git 1.7.12.3v1.7.12.3 | Junio C Hamano | 2012-10-08 | 3 | -2/+19 |
* | | | | | | | | | Merge branch 'os/commit-submodule-ignore' into maint | Junio C Hamano | 2012-10-08 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | commit: pay attention to submodule.$name.ignore in .gitmodules | Orgad Shaneh | 2012-09-24 | 1 | -0/+1 |
* | | | | | | | | | | Merge branch 'jk/receive-pack-unpack-error-to-pusher' into maint | Junio C Hamano | 2012-10-08 | 2 | -5/+32 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | receive-pack: drop "n/a" on unpacker errors | Jeff King | 2012-09-21 | 2 | -2/+2 |
| * | | | | | | | | | | receive-pack: send pack-processing stderr over sideband | Jeff King | 2012-09-21 | 1 | -2/+24 |
| * | | | | | | | | | | receive-pack: redirect unpack-objects stdout to /dev/null | Jeff King | 2012-09-21 | 1 | -1/+6 |
* | | | | | | | | | | | Merge branch 'rt/maint-clone-single' into maint | Junio C Hamano | 2012-10-08 | 3 | -18/+218 |
|\ \ \ \ \ \ \ \ \ \ \ |