aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'cb/maint-merge-recursive-submodule-fix'Junio C Hamano2009-04-07
|\
| * simplify output of conflicting mergeClemens Buchacher2009-04-05
| * update cache for conflicting submodule entriesClemens Buchacher2009-04-05
| * add tests for merging with submodulesClemens Buchacher2009-04-05
* | Merge branch 'mh/html-path'Junio C Hamano2009-04-07
|\ \
| * | add --html-path to get the location of installed HTML docsMarkus Heidelberg2009-04-04
* | | git-rev-list.txt: make ascii markup uniform with other pages.Matthieu Moy2009-04-07
* | | git-send-email.txt: clarify which options take an argument.Matthieu Moy2009-04-07
* | | Merge branch 'jc/name-branch'Junio C Hamano2009-04-06
|\ \ \
| * | | Don't permit ref/branch names to end with ".lock"Shawn O. Pearce2009-03-24
| * | | check_ref_format(): tighten refname rulesJunio C Hamano2009-03-24
| * | | strbuf_check_branch_ref(): a helper to check a refname for a branchJunio C Hamano2009-03-22
| * | | Fix branch -m @{-1} newnameJunio C Hamano2009-03-22
| * | | check-ref-format --branch: give Porcelain a way to grok branch shorthandJunio C Hamano2009-03-22
| * | | strbuf_branchname(): a wrapper for branch name shorthandsJunio C Hamano2009-03-22
| * | | Rename interpret/substitute nth_last_branch functionsJunio C Hamano2009-03-22
* | | | Merge branch 'jc/shared-literally'Junio C Hamano2009-04-06
|\ \ \ \
| * | | | t1301: loosen test for forced modesJeff King2009-04-01
| * | | | set_shared_perm(): sometimes we know what the final mode bits should look likeJunio C Hamano2009-03-28
| * | | | move_temp_to_file(): do not forget to chmod() in "Coda hack" codepathJunio C Hamano2009-03-28
| * | | | Move chmod(foo, 0444) into move_temp_to_file()Johan Herland2009-03-27
| * | | | "core.sharedrepository = 0mode" should set, not loosenJunio C Hamano2009-03-27
* | | | | Merge branch 'mg/tracked-local-branches'Junio C Hamano2009-04-06
|\ \ \ \ \
| * | | | | Make local branches behave like remote branches when --trackedMichael J Gruber2009-04-01
| * | | | | Test for local branches being followed with --trackMichael J Gruber2009-03-27
* | | | | | Merge branch 'sb/format-patch-patchname'Junio C Hamano2009-04-06
|\ \ \ \ \ \
| * | | | | | format_sanitized_subject: Don't trim past initial length of strbufStephen Boyd2009-04-01
| * | | | | | log-tree: fix patch filename computation in "git format-patch"Christian Couder2009-03-27
| * | | | | | format-patch: --numbered-files and --stdout aren't mutually exclusiveStephen Boyd2009-03-22
| * | | | | | format-patch: --attach/inline uses filename instead of SHA1Stephen Boyd2009-03-22
| * | | | | | format-patch: move get_patch_filename() into log-treeStephen Boyd2009-03-22
| * | | | | | format-patch: pass a commit to reopen_stdout()Stephen Boyd2009-03-22
| * | | | | | format-patch: construct patch filename in one functionStephen Boyd2009-03-22
| * | | | | | pretty.c: add %f format specifier to format_commit_message()Stephen Boyd2009-03-22
* | | | | | | user-manual: the name of the hash function is SHA-1, not sha1Felipe Contreras2009-04-06
* | | | | | | docbook: change css styleFelipe Contreras2009-04-06
* | | | | | | user-manual: remove some git-foo usageFelipe Contreras2009-04-06
* | | | | | | Documentation: branch.*.merge can also affect 'git-push'Santi BĂ©jar2009-04-06
* | | | | | | Add configuration variable for sign-off to format-patchHeiko Voigt2009-04-06
* | | | | | | bash completion: Update 'git am' optionsTodd Zullinger2009-04-05
* | | | | | | Merge branch 'maint'Junio C Hamano2009-04-05
|\ \ \ \ \ \ \
| * | | | | | | git submodule: fix usage lineJulien Danjou2009-04-05
| * | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-05
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-05
| | |\ \ \ \ \ \ \
| | | * | | | | | | commit: abort commit if interactive add failedJeff King2009-04-05
| | | * | | | | | | git-repack: use non-dashed update-server-infoDan McGee2009-04-05
| * | | | | | | | | doc/git-pack-refs: fix two grammar issuesMarkus Heidelberg2009-04-05
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | tests: remove exit after test_done callJeff King2009-04-05
* | | | | | | | | bisect: improve error message when branch checkout failsChristian Couder2009-04-05
* | | | | | | | | send-email: fix nasty bug in ask() functionJay Soffian2009-04-04
| |_|_|_|_|_|_|/ |/| | | | | | |