Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Update dtaft release notes to 1.8.3 | Junio C Hamano | 2013-04-11 |
* | Merge branch 'ap/combine-diff-coalesce-lost' | Junio C Hamano | 2013-04-11 |
|\ | |||
| * | combine-diff: coalesce lost lines optimally | Antoine Pelisse | 2013-03-25 |
* | | Merge branch 'sr/log-SG-no-textconv' | Junio C Hamano | 2013-04-11 |
|\ \ | |||
| * | | diffcore-pickaxe: unify code for log -S/-G | Jeff King | 2013-04-05 |
| * | | diffcore-pickaxe: fix leaks in "log -S<block>" and "log -G<pattern>" | Junio C Hamano | 2013-04-05 |
| * | | diffcore-pickaxe: port optimization from has_changes() to diff_grep() | Junio C Hamano | 2013-04-05 |
| * | | diffcore-pickaxe: respect --no-textconv | Simon Ruderich | 2013-04-05 |
| * | | diffcore-pickaxe: remove fill_one() | Jeff King | 2013-04-04 |
| * | | diffcore-pickaxe: remove unnecessary call to get_textconv() | Simon Ruderich | 2013-04-04 |
* | | | Merge branch 'js/rerere-forget-protect-against-NUL' | Junio C Hamano | 2013-04-11 |
|\ \ \ | |||
| * | | | rerere forget: do not segfault if not all stages are present | Johannes Sixt | 2013-04-04 |
| * | | | rerere forget: grok files containing NUL | Johannes Sixt | 2013-04-02 |
* | | | | Merge branch 'po/help-guides' | Junio C Hamano | 2013-04-11 |
|\ \ \ \ | |||
| * | | | | doc: include --guide option description for "git help" | Philip Oakley | 2013-04-03 |
| * | | | | help: mention -a and -g option, and 'git help <concept>' usage. | Philip Oakley | 2013-04-02 |
| * | | | | builtin/help.c: add list_common_guides_help() function | Philip Oakley | 2013-04-02 |
| * | | | | builtin/help.c: add --guide option | Philip Oakley | 2013-04-02 |
| * | | | | builtin/help.c: split "-a" processing into two | Philip Oakley | 2013-04-02 |
* | | | | | remote-bzr: improve tag handling | Felipe Contreras | 2013-04-08 |
* | | | | | remote-bzr: fix utf-8 support for fetching | Christophe Simonis | 2013-04-08 |
* | | | | | Revert 4b7f53da7618 (simplify-merges: drop merge from irrelevant side branch,... | Junio C Hamano | 2013-04-08 |
* | | | | | Sync with 1.8.2.1 | Junio C Hamano | 2013-04-07 |
|\ \ \ \ \ | |||
| * | | | | | Git 1.8.2.1v1.8.2.1 | Junio C Hamano | 2013-04-07 |
| * | | | | | Sync with 1.8.1.6 | Junio C Hamano | 2013-04-07 |
| |\ \ \ \ \ | |||
| | * | | | | | Git 1.8.1.6v1.8.1.6 | Junio C Hamano | 2013-04-07 |
| | * | | | | | Merge branch 'jc/directory-attrs-regression-fix' into maint-1.8.1 | Junio C Hamano | 2013-04-07 |
| | |\ \ \ \ \ | |||
| | * | | | | | | remote-helpers/test-bzr.sh: do not use "grep '\s'" | Torsten Bögershausen | 2013-04-07 |
* | | | | | | | | Update draft release notes to 1.8.3 | Junio C Hamano | 2013-04-07 |
* | | | | | | | | Merge branch 'jk/rm-removed-paths' | Junio C Hamano | 2013-04-07 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | t3600: document failure of rm across symbolic links | Jeff King | 2013-04-04 |
| * | | | | | | | | t3600: test behavior of reverse-d/f conflict | Jeff King | 2013-04-04 |
| * | | | | | | | | rm: do not complain about d/f conflicts during deletion | Jeff King | 2013-04-04 |
* | | | | | | | | | Merge branch 'tb/shared-perm' | Junio C Hamano | 2013-04-07 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | path.c: optimize adjust_shared_perm() | Torsten Bögershausen | 2013-04-05 |
| * | | | | | | | | | path.c: simplify adjust_shared_perm() | Torsten Bögershausen | 2013-04-05 |
* | | | | | | | | | | Merge branch 'cn/commit-amend-doc' | Junio C Hamano | 2013-04-07 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | Documentation/git-commit: reword the --amend explanation | Carlos Martín Nieto | 2013-04-05 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'fc/remote-helpers-test-updates' | Junio C Hamano | 2013-04-07 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | remote-hg: fix hg-git test-case | Felipe Contreras | 2013-04-04 |
| * | | | | | | | | | | remote-bzr: remove stale check code for tests | Felipe Contreras | 2013-04-04 |
| * | | | | | | | | | | remote-helpers: fix the run of all tests | Felipe Contreras | 2013-04-04 |
| * | | | | | | | | | | remote-bzr: avoid echo -n | Felipe Contreras | 2013-04-04 |
* | | | | | | | | | | | Merge branch 'mg/texinfo-5' | Junio C Hamano | 2013-04-07 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | Documentation: Strip texinfo anchors to avoid duplicates | Martin von Gagern | 2013-04-03 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'jk/diffcore-break-divzero' | Junio C Hamano | 2013-04-07 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | diffcore-break: don't divide by zero | John Keeping | 2013-04-03 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'jk/bisect-prn-unsigned' | Junio C Hamano | 2013-04-07 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | bisect: avoid signed integer overflow | John Keeping | 2013-04-03 |
| |/ / / / / / / / / / | |||
* | | | | | | | | | | | Merge branch 'rr/triangle' | Junio C Hamano | 2013-04-07 |
|\ \ \ \ \ \ \ \ \ \ \ |