summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dk/blame-janitorial'Junio C Hamano2014-02-271-51/+42
|\
| * builtin/blame.c::find_copy_in_blob: no need to scan for region enddk/blame-janitorialDavid Kastrup2014-02-251-8/+1
| * blame.c: prepare_lines should not call xrealloc for every lineDavid Kastrup2014-02-241-15/+31
| * builtin/blame.c::prepare_lines: fix allocation size of sb->linenoDavid Kastrup2014-02-241-2/+2
| * builtin/blame.c: eliminate same_suspect()David Kastrup2014-02-241-17/+8
| * builtin/blame.c: struct blame_entry does not need a prev linkDavid Kastrup2014-01-221-11/+2
* | Merge branch 'bc/gpg-sign-everywhere'Junio C Hamano2014-02-2718-59/+135
|\ \
| * | pull: add the --gpg-sign option.bc/gpg-sign-everywherebrian m. carlson2014-02-111-1/+12
| * | rebase: add the --gpg-sign optionNicolas Vigier2014-02-115-17/+47
| * | rebase: parse options in stuck-long modeNicolas Vigier2014-02-111-28/+22
| * | rebase: don't try to match -M optionNicolas Vigier2014-02-031-1/+1
| * | rebase: remove useless arguments checkNicolas Vigier2014-02-031-2/+0
| * | am: add the --gpg-sign optionNicolas Vigier2014-02-032-2/+13
| * | am: parse options in stuck-long modeNicolas Vigier2014-02-031-9/+9
| * | git-sh-setup.sh: add variable to use the stuck-long modeNicolas Vigier2014-02-037-0/+8
| * | cherry-pick, revert: add the --gpg-sign optionNicolas Vigier2014-01-275-2/+26
* | | Merge branch 'al/docs'Junio C Hamano2014-02-274-10/+8
|\ \ \
| * | | docs/git-blame: explain more clearly the example pickaxe useal/docsAlbert L. Lash, IV2014-02-111-1/+2
| * | | docs/git-clone: clarify use of --no-hardlinks optionAlbert L. Lash, IV2014-02-111-7/+4
| * | | docs/git-remote: capitalize first word of initial blurbAlbert L. Lash, IV2014-02-111-1/+1
| * | | docs/merge-strategies: remove hyphen from mis-mergesAlbert L. Lash, IV2014-02-111-1/+1
* | | | Merge branch 'jk/test-ports'Junio C Hamano2014-02-2710-10/+2
|\ \ \ \
| * | | | tests: auto-set git-daemon portjk/test-portsJeff King2014-02-102-2/+1
| * | | | tests: auto-set LIB_HTTPD_PORT from test nameJeff King2014-02-108-8/+1
* | | | | Merge branch 'nd/reset-intent-to-add'Junio C Hamano2014-02-275-15/+50
|\ \ \ \ \
| * | | | | reset: support "--mixed --intent-to-add" modend/reset-intent-to-addNguyễn Thái Ngọc Duy2014-02-055-15/+50
| |/ / / /
* | | | | Merge branch 'ks/tree-diff-walk'Junio C Hamano2014-02-275-59/+10
|\ \ \ \ \
| * | | | | tree-walk: finally switch over tree descriptors to contain a pre-parsed entryks/tree-diff-walkKirill Smelkov2014-02-242-2/+2
| * | | | | revision: convert to using diff_tree_sha1()Kirill Smelkov2014-02-051-11/+1
| * | | | | line-log: convert to using diff_tree_sha1()Kirill Smelkov2014-02-051-24/+2
| * | | | | tree-diff: convert diff_root_tree_sha1() to just call diff_tree_sha1 with old...Kirill Smelkov2014-02-051-14/+1
| * | | | | tree-diff: allow diff_tree_sha1 to accept NULL sha1Kirill Smelkov2014-02-051-8/+4
| |/ / / /
* | | | | Merge branch 'mw/symlinks'Junio C Hamano2014-02-273-20/+112
|\ \ \ \ \
| * | | | | setup: don't dereference in-tree symlinks for absolute pathsMartin Erik Werner2014-02-043-22/+12
| * | | | | setup: add abspath_part_inside_repo() functionMartin Erik Werner2014-02-041-0/+64
| * | | | | t0060: add tests for prefix_path when path begins with work treeMartin Erik Werner2014-02-041-0/+10
| * | | | | t0060: add test for prefix_path when path == work treeMartin Erik Werner2014-02-041-0/+6
| * | | | | t0060: add test for prefix_path on symlinks via absolute pathsMartin Erik Werner2014-02-041-0/+5
| * | | | | t3004: add test for ls-files on symlinks via absolute pathsJunio C Hamano2014-02-041-0/+17
* | | | | | Merge branch 'nd/test-rename-reset'Junio C Hamano2014-02-272-0/+0
|\ \ \ \ \ \
| * | | | | | t7101, t7014: rename test files to indicate what that file is fornd/test-rename-resetNguyễn Thái Ngọc Duy2014-02-042-0/+0
* | | | | | | Merge branch 'wk/submodule-on-branch'Junio C Hamano2014-02-274-42/+135
|\ \ \ \ \ \ \
| * | | | | | | Documentation: describe 'submodule update --remote' use casewk/submodule-on-branchW. Trevor King2014-02-241-0/+10
| * | | | | | | submodule: explicit local branch creation in module_cloneW. Trevor King2014-02-244-27/+110
| * | | | | | | submodule: document module_clone arguments in commentsW. Trevor King2014-02-241-0/+6
| * | | | | | | submodule: make 'checkout' update_module mode more explicitW. Trevor King2014-02-241-16/+11
* | | | | | | | Merge branch 'ep/varscope'Junio C Hamano2014-02-277-19/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin/gc.c: reduce scope of variablesep/varscopeElia Pinto2014-01-311-2/+3
| * | | | | | | | builtin/fetch.c: reduce scope of variableElia Pinto2014-01-311-1/+1
| * | | | | | | | builtin/commit.c: reduce scope of variablesElia Pinto2014-01-311-5/+6
View Lorry Controller Status