aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Introduce get_merge_bases_many()Junio C Hamano2008-06-30
* Add new test to ensure git-merge handles more than 25 refs.Miklos Vajna2008-06-30
* Introduce get_octopus_merge_bases() in commit.cMiklos Vajna2008-06-30
* git-fmt-merge-msg: make it usable from other builtinsMiklos Vajna2008-06-30
* Move read_cache_unmerged() to read-cache.cMiklos Vajna2008-06-30
* Add new test to ensure git-merge handles pull.twohead and pull.octopusMiklos Vajna2008-06-30
* Move parse-options's skip_prefix() to git-compat-util.hMiklos Vajna2008-06-30
* Move commit_list_count() to commit.cMiklos Vajna2008-06-30
* Move split_cmdline() to alias.cMiklos Vajna2008-06-30
* Merge branch 'maint'Junio C Hamano2008-06-30
|\
| * doc/rev-parse: clarify reflog vs --until for specifying revisionsJeff King2008-06-29
* | Add test results directory to t/.gitignoreBrian Gernhardt2008-06-30
* | Update draft release notes for 1.6.0Junio C Hamano2008-06-29
* | Documentation: don't assume git-sh-setup and git-parse-remote are in PATHjrnieder@uchicago.edu2008-06-29
* | t9700: skip when Test::More is not availableJunio C Hamano2008-06-29
* | Merge branch 'maint'Junio C Hamano2008-06-28
|\ \ | |/
| * git-svn: don't sanitize remote names in configEric Wong2008-06-28
| * git-svn: avoid filling up the disk with temp files.Avery Pennarun2008-06-28
| * git cat-file: Fix memory leak in batch modeBjörn Steinbrink2008-06-28
| * fix git config example syntaxJoey Hess2008-06-28
| * avoid off-by-one error in run_upload_archiveJochen Voss2008-06-28
* | show_stats(): fix stats width calculationOlivier Marin2008-06-28
* | Documentation: remove {show,whatchanged}.difftree config optionsOlivier Marin2008-06-28
* | GIT-VERSION-GEN: do not fail if a 'HEAD' file exists in the working copyLea Wiemann2008-06-28
* | commit-tree: lift completely arbitrary limit of 16 parentsJohannes Schindelin2008-06-27
* | shrink git-shell by avoiding redundant dependenciesDmitry Potapov2008-06-27
* | help: check early if we have a command, if not try a documentation topicChristian Couder2008-06-27
* | Document the double-dash "rev -- path" disambiguatorJunio C Hamano2008-06-27
* | Don't use dash commands (git-foo) in tutorial-2Ted Percival2008-06-26
* | test-lib.sh: show git init output when in verbose modeLea Wiemann2008-06-26
* | Merge branch 'maint'Junio C Hamano2008-06-26
|\ \ | |/
| * Merge branch 'maint-1.5.5' into maintJunio C Hamano2008-06-26
| |\
| | * GIT 1.5.5.5v1.5.5.5Junio C Hamano2008-06-26
| | * Merge branch 'maint-1.5.4' into maint-1.5.5Junio C Hamano2008-06-26
| | |\
| | | * GIT 1.5.4.6v1.5.4.6Junio C Hamano2008-06-26
| | | * git-shell: accept "git foo" formJunio C Hamano2008-06-26
| * | | diff --check: do not discard error status upon seeing a good lineJunio C Hamano2008-06-26
* | | | improve for-each-ref test scriptJeff King2008-06-26
* | | | Add 'git-p4.allowSubmit' to git-p4Jing Xue2008-06-26
* | | | Start draft release notes for 1.6.0Junio C Hamano2008-06-26
* | | | update-hook-example: optionally allow non-fast-forwardDmitry Potapov2008-06-25
* | | | Merge branch 'maint'Junio C Hamano2008-06-25
|\ \ \ \ | |/ / /
| * | | GIT 1.5.6.1v1.5.6.1Junio C Hamano2008-06-25
| * | | fix update-hook-example to work with packed tag referencesDmitry Potapov2008-06-25
| * | | clone: create intermediate directories of destination repoJeff King2008-06-25
| * | | Merge branch 'jc/maint-combine-diff-pre-context' into maintJunio C Hamano2008-06-25
| |\ \ \
| * \ \ \ Merge branch 'lt/maint-gitdir-relative' into maintJunio C Hamano2008-06-25
| |\ \ \ \
| * \ \ \ \ Merge branch 'sb/maint-rebase' into maintJunio C Hamano2008-06-25
| |\ \ \ \ \
| | * | | | | git-rebase.sh: Add check if rebase is in progressStephan Beyer2008-06-22
| * | | | | | for-each-ref: implement missing tag valuesJeff King2008-06-25