summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Allow users to un-configure rename detectionLinus Torvalds2009-04-111-2/+2
* Update draft release notes to 1.6.3Junio C Hamano2009-04-091-2/+27
* Merge branch 'maint'Junio C Hamano2009-04-085-25/+53
|\
| * Start 1.6.2.3 preparationJunio C Hamano2009-04-082-1/+29
| * Merge branch 'jc/shared-literally' into maintJunio C Hamano2009-04-0810-38/+97
| |\
| * \ Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maintJunio C Hamano2009-04-082-1/+17
| |\ \
| * \ \ Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-082-3/+0
| |\ \ \
| | * \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-082-3/+0
| | |\ \ \
| | | * | | process_{tree,blob}: Remove useless xstrdup callsBjörn Steinbrink2009-04-082-3/+0
| | * | | | Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1Junio C Hamano2009-04-081-4/+4
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1Junio C Hamano2009-04-082-2/+2
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1Junio C Hamano2009-04-081-0/+4
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint-1.6.1Junio C Hamano2009-04-081-9/+12
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge branch 'jc/maint-1.6.0-keep-pack' into maintJunio C Hamano2009-04-0811-74/+105
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-pull.sh: better warning message for "git pull" on detached head.Matthieu Moy2009-04-081-17/+25
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-04-075-12/+16
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-073-9/+13
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-073-9/+13
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | | * | | | | | | | Documentation: clarify .gitattributes searchJason Merrill2009-04-072-5/+5
| | | * | | | | | | | git-checkout.txt: clarify that <branch> applies when no path is given.Matthieu Moy2009-04-071-2/+6
| | | * | | | | | | | git-checkout.txt: fix incorrect statement about HEAD and indexMatthieu Moy2009-04-071-2/+2
| * | | | | | | | | | Change double quotes to single quotes in messageJari Aalto2009-04-072-4/+4
* | | | | | | | | | | Merge branch 'lt/reflog-expire'Junio C Hamano2009-04-071-6/+70
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Speed up reflog pruning of unreachable commitsJunio Hamano2009-04-011-0/+44
| * | | | | | | | | | | Clean up reflog unreachability pruning decisionLinus Torvalds2009-04-011-6/+26
* | | | | | | | | | | | Merge branch 'bs/maint-1.6.0-tree-walk-prefix'Junio C Hamano2009-04-074-5/+29
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | match_tree_entry(): a pathspec only matches at directory boundariesJunio C Hamano2009-04-012-2/+12
| * | | | | | | | | | | | tree_entry_interesting: a pathspec only matches at directory boundaryBjörn Steinbrink2009-04-012-3/+17
* | | | | | | | | | | | | Merge branch 'ms/http-auth'Junio C Hamano2009-04-073-0/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Allow curl to rewind the read buffersMartin Storsjö2009-04-023-0/+50
* | | | | | | | | | | | | | Merge branch 'js/maint-submodule-checkout'Junio C Hamano2009-04-072-3/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix 'git checkout <submodule>' to update the indexJohannes Schindelin2009-04-022-3/+42
* | | | | | | | | | | | | | | Merge branch 'cb/maint-merge-recursive-submodule-fix'Junio C Hamano2009-04-072-12/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | simplify output of conflicting mergeClemens Buchacher2009-04-051-13/+4
| * | | | | | | | | | | | | | | update cache for conflicting submodule entriesClemens Buchacher2009-04-052-3/+4
| * | | | | | | | | | | | | | | add tests for merging with submodulesClemens Buchacher2009-04-051-0/+74
* | | | | | | | | | | | | | | | Merge branch 'mh/html-path'Junio C Hamano2009-04-075-3/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | add --html-path to get the location of installed HTML docsMarkus Heidelberg2009-04-045-3/+22
* | | | | | | | | | | | | | | | | git-rev-list.txt: make ascii markup uniform with other pages.Matthieu Moy2009-04-071-11/+11
* | | | | | | | | | | | | | | | | git-send-email.txt: clarify which options take an argument.Matthieu Moy2009-04-071-17/+17
* | | | | | | | | | | | | | | | | Merge branch 'jc/name-branch'Junio C Hamano2009-04-0611-50/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Don't permit ref/branch names to end with ".lock"Shawn O. Pearce2009-03-242-0/+5
| * | | | | | | | | | | | | | | | | check_ref_format(): tighten refname rulesJunio C Hamano2009-03-243-7/+28
| * | | | | | | | | | | | | | | | | strbuf_check_branch_ref(): a helper to check a refname for a branchJunio C Hamano2009-03-226-17/+17
| * | | | | | | | | | | | | | | | | Fix branch -m @{-1} newnameJunio C Hamano2009-03-221-7/+7
| * | | | | | | | | | | | | | | | | check-ref-format --branch: give Porcelain a way to grok branch shorthandJunio C Hamano2009-03-222-0/+22
| * | | | | | | | | | | | | | | | | strbuf_branchname(): a wrapper for branch name shorthandsJunio C Hamano2009-03-226-22/+18
| * | | | | | | | | | | | | | | | | Rename interpret/substitute nth_last_branch functionsJunio C Hamano2009-03-226-11/+11
* | | | | | | | | | | | | | | | | | Merge branch 'jc/shared-literally'Junio C Hamano2009-04-0610-38/+97
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | t1301: loosen test for forced modesJeff King2009-04-011-2/+2
View Lorry Controller Status