Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2011-02-15 | 15 | -63/+49 |
|\ | |||||
| * | pull: do not display fetch usage on --help-all | Michael J Gruber | 2011-02-15 | 1 | -1/+1 |
| * | git-tag.txt: list all modes in the description | Michael J Gruber | 2011-02-15 | 1 | -5/+6 |
| * | commit,status: describe -u likewise | Michael J Gruber | 2011-02-15 | 1 | -1/+1 |
| * | add: describe --patch like checkout, reset | Michael J Gruber | 2011-02-15 | 1 | -1/+1 |
| * | commit,merge,tag: describe -m likewise | Michael J Gruber | 2011-02-15 | 3 | -5/+5 |
| * | clone,init: describe --template using the same wording | Michael J Gruber | 2011-02-15 | 2 | -3/+3 |
| * | commit,status: describe --porcelain just like push | Michael J Gruber | 2011-02-15 | 1 | -2/+2 |
| * | commit,tag: use same wording for -F | Michael J Gruber | 2011-02-15 | 2 | -2/+2 |
| * | configure: use AC_LANG_PROGRAM consistently | Ralf Wildenhues | 2011-02-14 | 2 | -39/+21 |
| * | string_list_append: always set util pointer to NULL | Jeff King | 2011-02-14 | 1 | -0/+1 |
| * | correct type of EMPTY_TREE_SHA1_BIN | Jonathan Nieder | 2011-02-14 | 4 | -4/+6 |
* | | Revert "unpack_trees(): skip trees that are the same in all input" | Junio C Hamano | 2011-02-15 | 1 | -56/+0 |
* | | Obey p4 views when using client spec | Ian Wienand | 2011-02-14 | 2 | -4/+51 |
* | | gitignore: add test-mktemp to ignore list | Ævar Arnfjörð Bjarmason | 2011-02-13 | 1 | -0/+1 |
* | | repo-config: add deprecation warning | René Scharfe | 2011-02-13 | 3 | -2/+9 |
* | | Merge branch 'maint' | Junio C Hamano | 2011-02-11 | 4 | -2/+33 |
|\ \ | |/ | |||||
| * | Git 1.7.4.1v1.7.4.1 | Junio C Hamano | 2011-02-11 | 4 | -3/+31 |
| * | Merge branch 'jc/fsck-fixes' into maint | Junio C Hamano | 2011-02-11 | 1 | -9/+22 |
| |\ | |||||
| * | | clone: fixup recurse_submodules option | Chris Packham | 2011-02-11 | 1 | -1/+1 |
| * | | svn-fe: warn about experimental status | Jonathan Nieder | 2011-02-11 | 1 | -0/+3 |
* | | | Merge branch 'maint' | Junio C Hamano | 2011-02-10 | 4 | -4/+11 |
|\ \ \ | |/ / | |||||
| * | | compat: helper for detecting unsigned overflow | Jonathan Nieder | 2011-02-10 | 4 | -4/+11 |
* | | | 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 |
|\ \ \ \ \ \ \ \ \ |