Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rebase: stricter check of standalone sub command | Martin von Zweigbergk | 2011-02-10 | 4 | -2/+22 |
* | rebase: act on command line outside parsing loop | Martin von Zweigbergk | 2011-02-10 | 2 | -209/+217 |
* | rebase: improve detection of rebase in progress | Martin von Zweigbergk | 2011-02-10 | 1 | -39/+41 |
* | rebase: remove unused rebase state 'prev_head' | Martin von Zweigbergk | 2011-02-10 | 1 | -8/+0 |
* | rebase: read state outside loop | Martin von Zweigbergk | 2011-02-10 | 1 | -2/+2 |
* | rebase: refactor reading of state | Martin von Zweigbergk | 2011-02-10 | 1 | -30/+23 |
* | rebase: clearer names for directory variables | Martin von Zweigbergk | 2011-02-10 | 1 | -70/+71 |
* | Merge branch 'tr/merge-unborn-clobber' | Junio C Hamano | 2011-02-09 | 1 | -0/+16 |
|\ | |||||
| * | Exhibit merge bug that clobbers index&WT | Thomas Rast | 2010-08-25 | 1 | -0/+16 |
* | | Merge branch 'jc/unpack-trees' | Junio C Hamano | 2011-02-09 | 1 | -2/+62 |
|\ \ | |||||
| * | | unpack_trees(): skip trees that are the same in all input | Junio C Hamano | 2011-01-04 | 1 | -0/+56 |
| * | | unpack-trees.c: cosmetic fix | Junio C Hamano | 2010-12-22 | 1 | -4/+8 |
* | | | Merge branch 'jc/fsck-fixes' | Junio C Hamano | 2011-02-09 | 1 | -9/+22 |
|\ \ \ | |||||
| * | | | fsck: do not give up too early in fsck_dir() | Junio C Hamano | 2011-01-27 | 1 | -6/+12 |
| * | | | fsck: drop unused parameter from traverse_one_object() | Junio C Hamano | 2011-01-27 | 1 | -3/+10 |
* | | | | Merge branch 'tr/diff-words-test' | Junio C Hamano | 2011-02-09 | 41 | -255/+933 |
|\ \ \ \ | |||||
| * | | | | t4034 (diff --word-diff): add a minimum Perl drier test vector | Junio C Hamano | 2011-01-18 | 4 | -0/+58 |
| * | | | | t4034 (diff --word-diff): style suggestions | Jonathan Nieder | 2011-01-18 | 1 | -245/+205 |
| * | | | | userdiff: simplify word-diff safeguard | Jonathan Nieder | 2011-01-18 | 1 | -24/+16 |
| * | | | | t4034: bulk verify builtin word regex sanity | Thomas Rast | 2011-01-18 | 37 | -0/+668 |
* | | | | | Merge branch 'rr/fi-import-marks-if-exists' | Junio C Hamano | 2011-02-09 | 3 | -3/+72 |
|\ \ \ \ \ | |||||
| * | | | | | fast-import: Introduce --import-marks-if-exists | Ramkumar Ramachandra | 2011-01-18 | 3 | -3/+72 |
| |/ / / / | |||||
* | | | | | Merge branch 'jn/unpack-lstat-failure-report' | Junio C Hamano | 2011-02-09 | 1 | -6/+12 |
|\ \ \ \ \ | |||||
| * | | | | | unpack-trees: handle lstat failure for existing file | Jonathan Nieder | 2011-01-13 | 1 | -1/+3 |
| * | | | | | unpack-trees: handle lstat failure for existing directory | Jonathan Nieder | 2011-01-13 | 1 | -5/+9 |
* | | | | | | Merge branch 'ef/alias-via-run-command' | Junio C Hamano | 2011-02-09 | 1 | -17/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | alias: use run_command api to execute aliases | Erik Faye-Lund | 2011-01-06 | 1 | -17/+17 |
* | | | | | | | Merge branch 'cb/setup' | Junio C Hamano | 2011-02-09 | 1 | -4/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | setup: translate symlinks in filename when using absolute paths | Carlo Marcelo Arenas Belon | 2011-01-04 | 1 | -4/+7 |
* | | | | | | | | Merge branch 'ae/better-template-failure-report' | Junio C Hamano | 2011-02-09 | 4 | -4/+56 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Improve error messages when temporary file creation fails | Arnout Engelen | 2010-12-21 | 4 | -4/+56 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jn/cherry-pick-strategy-option' | Junio C Hamano | 2011-02-09 | 7 | -11/+97 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | cherry-pick/revert: add support for -X/--strategy-option | Jonathan Nieder | 2010-12-28 | 7 | -11/+97 |
* | | | | | | | | | Merge branch 'maint-1.7.0' into maint | Junio C Hamano | 2011-02-09 | 3 | -0/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fast-import: introduce "feature notes" command | Jonathan Nieder | 2011-02-09 | 3 | -0/+9 |
| * | | | | | | | | | fast-import: clarify documentation of "feature" command | Jonathan Nieder | 2011-02-09 | 1 | -20/+17 |
* | | | | | | | | | | Documentation/merge subtree How-To: fix typo | Uwe Kleine-König | 2011-02-09 | 1 | -1/+1 |
* | | | | | | | | | | pull: Document the "--[no-]recurse-submodules" options | Jens Lehmann | 2011-02-07 | 2 | -2/+9 |
* | | | | | | | | | | quote.h: simplify the inclusion | Jonathan Nieder | 2011-02-07 | 1 | -2/+1 |
* | | | | | | | | | | sha1_object_info: examine cached_object store too | Nguyễn Thái Ngọc Duy | 2011-02-07 | 1 | -0/+8 |
* | | | | | | | | | | sha1_file.c: move find_cached_object up so sha1_object_info can use it | Nguyễn Thái Ngọc Duy | 2011-02-07 | 1 | -35/+35 |
* | | | | | | | | | | Add const to parse_{commit,tag}_buffer() | Nguyễn Thái Ngọc Duy | 2011-02-07 | 4 | -6/+6 |
* | | | | | | | | | | diff: support --cached on unborn branches | Nguyễn Thái Ngọc Duy | 2011-02-07 | 5 | -2/+71 |
* | | | | | | | | | | gitweb: Mention optional Perl modules in INSTALL | Jakub Narebski | 2011-02-07 | 1 | -0/+6 |
* | | | | | | | | | | post-receive-email: suppress error if description file missing | Sitaram Chamarty | 2011-02-07 | 1 | -1/+1 |
* | | | | | | | | | | t7407: fix line endings for mingw build | Pat Thoyts | 2011-02-07 | 1 | -0/+4 |
* | | | | | | | | | | t4120-apply-popt: help systems with core.filemode=false | Johannes Sixt | 2011-02-07 | 1 | -2/+7 |
* | | | | | | | | | | t3509: use unconstrained initial test to setup repository. | Pat Thoyts | 2011-02-07 | 1 | -2/+4 |
* | | | | | | | | | | start_command: flush buffers in the WIN32 code path as well | Johannes Sixt | 2011-02-07 | 1 | -1/+1 |
* | | | | | | | | | | bundle: Use OFS_DELTA in bundle files | Shawn O. Pearce | 2011-02-06 | 1 | -2/+3 |