Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mm/maint-config-explicit-bool-display' | Junio C Hamano | 2011-10-17 | 1 | -7/+13 |
|\ | |||||
| * | config: display key_delim for config --bool --get-regexp | Matthieu Moy | 2011-10-10 | 1 | -7/+13 |
* | | Merge branch 'tc/fetch-leak' | Junio C Hamano | 2011-10-17 | 1 | -4/+9 |
|\ \ | |||||
| * | | fetch: plug two leaks on error exit in store_updated_refs | Tay Ray Chuan | 2011-10-07 | 1 | -4/+9 |
* | | | Merge branch 'ph/push-to-delete-nothing' | Junio C Hamano | 2011-10-17 | 1 | -8/+18 |
|\ \ \ | |||||
| * | | | receive-pack: don't pass non-existent refs to post-{receive,update} hooksph/push-to-delete-nothing | Pang Yan Han | 2011-09-30 | 1 | -6/+12 |
* | | | | Merge branch 'jc/checkout-from-tree-keep-local-changes' | Junio C Hamano | 2011-10-17 | 1 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | checkout $tree $path: do not clobber local changes in $path not in $tree | Junio C Hamano | 2011-09-30 | 1 | -1/+5 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'jc/grep-untracked-exclude' | Junio C Hamano | 2011-10-15 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude | Junio C Hamano | 2011-10-15 | 1 | -1/+1 |
* | | | | | Merge branch 'il/archive-err-signal' | Junio C Hamano | 2011-10-13 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Support ERR in remote archive like in fetch/push | Ilari Liusvaara | 2011-10-05 | 1 | -0/+2 |
* | | | | | | Merge branch 'jc/grep-untracked-exclude' | Junio C Hamano | 2011-10-13 | 1 | -7/+17 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude | Junio C Hamano | 2011-10-04 | 1 | -10/+20 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'rs/pending' | Junio C Hamano | 2011-10-13 | 1 | -28/+18 |
|\ \ \ \ \ | |||||
| * | | | | | commit: factor out clear_commit_marks_for_object_arrayrs/pending | René Scharfe | 2011-10-03 | 1 | -7/+1 |
| * | | | | | checkout: use leak_pending flag | René Scharfe | 2011-10-03 | 1 | -13/+12 |
| * | | | | | checkout: use add_pending_{object,sha1} in orphan check | René Scharfe | 2011-10-03 | 1 | -27/+12 |
* | | | | | | Merge branch 'jc/apply-blank-at-eof-fix' | Junio C Hamano | 2011-10-13 | 1 | -2/+9 |
* | | | | | | Merge branch 'nd/maint-autofix-tag-in-head' | Junio C Hamano | 2011-10-13 | 3 | -59/+66 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Accept tags in HEAD or MERGE_HEAD | Nguyễn Thái Ngọc Duy | 2011-09-18 | 3 | -8/+7 |
| * | | | | | | merge: remove global variable head[] | Nguyễn Thái Ngọc Duy | 2011-09-18 | 1 | -44/+53 |
| * | | | | | | merge: use return value of resolve_ref() to determine if HEAD is invalid | Nguyễn Thái Ngọc Duy | 2011-09-18 | 1 | -1/+1 |
| * | | | | | | merge: keep stash[] a local variable | Nguyễn Thái Ngọc Duy | 2011-08-26 | 1 | -17/+16 |
* | | | | | | | Merge branch 'bw/grep-no-index-no-exclude' | Junio C Hamano | 2011-10-13 | 1 | -3/+3 |
* | | | | | | | Merge branch 'jc/parse-options-boolean' | Junio C Hamano | 2011-10-12 | 2 | -10/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | apply: use OPT_NOOP_NOARGjc/parse-options-boolean | René Scharfe | 2011-09-28 | 1 | -7/+2 |
| * | | | | | | | revert: use OPT_NOOP_NOARG | René Scharfe | 2011-09-28 | 1 | -3/+1 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'rs/name-rev-usage' | Junio C Hamano | 2011-10-12 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | name-rev: split usage stringrs/name-rev-usage | René Scharfe | 2011-10-03 | 1 | -1/+3 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'mh/check-ref-format-3' | Junio C Hamano | 2011-10-10 | 7 | -29/+46 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Change check_refname_format() to reject unnormalized refnames | Michael Haggerty | 2011-10-05 | 1 | -8/+7 |
| * | | | | | | | Inline function refname_format_print() | Michael Haggerty | 2011-10-05 | 1 | -9/+7 |
| * | | | | | | | Make collapse_slashes() allocate memory for its result | Michael Haggerty | 2011-10-05 | 1 | -9/+10 |
| * | | | | | | | Change check_ref_format() to take a flags argument | Michael Haggerty | 2011-10-05 | 7 | -27/+8 |
| * | | | | | | | git check-ref-format: add options --allow-onelevel and --refspec-pattern | Michael Haggerty | 2011-10-05 | 1 | -9/+47 |
* | | | | | | | | Merge branch 'mz/remote-rename' | Junio C Hamano | 2011-10-10 | 1 | -7/+21 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | remote: only update remote-tracking branch if updating refspec | Martin von Zweigbergk | 2011-09-11 | 1 | -3/+7 |
| * | | | | | | | | remote rename: warn when refspec was not updated | Martin von Zweigbergk | 2011-09-11 | 1 | -0/+6 |
| * | | | | | | | | remote: "rename o foo" should not rename ref "origin/bar" | Martin von Zweigbergk | 2011-09-11 | 1 | -1/+1 |
| * | | | | | | | | remote: write correct fetch spec when renaming remote 'remote' | Martin von Zweigbergk | 2011-09-11 | 1 | -4/+8 |
* | | | | | | | | | Merge branch 'cb/common-prefix-unification' | Junio C Hamano | 2011-10-10 | 2 | -3/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rename pathspec_prefix() to common_prefix() and move to dir.[ch] | Clemens Buchacher | 2011-09-12 | 2 | -2/+2 |
| * | | | | | | | | | remove prefix argument from pathspec_prefix | Clemens Buchacher | 2011-09-06 | 2 | -3/+4 |
* | | | | | | | | | | Merge branch 'fg/submodule-git-file-git-dir' | Junio C Hamano | 2011-10-10 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rev-parse: add option --resolve-git-dir <path> | Fredrik Gustafsson | 2011-08-16 | 1 | -0/+8 |
* | | | | | | | | | | | Fix some "variable might be used uninitialized" warnings | Ramsay Jones | 2011-10-09 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'js/check-attr-cached' | Junio C Hamano | 2011-10-05 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Teach '--cached' option to check-attr | Jay Soffian | 2011-09-22 | 1 | -0/+5 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jc/ls-remote-short-help' | Junio C Hamano | 2011-10-05 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ |