summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make merge-recursive honor diff.renamelimitLars Hjemli2007-09-251-0/+6
* Move convert-objects to contrib.Matt Kraai2007-09-256-4/+1
* Merge branch 'maint'Junio C Hamano2007-09-253-8/+12
|\
| * Do not over-quote the -f envelopesender value.Jim Meyering2007-09-251-6/+10
| * unexpected Make output (e.g. from --debug) causes build failureJim Meyering2007-09-251-1/+1
| * Fixed minor typo in t/t9001-send-email.sh test command line.Glenn Rempe2007-09-241-1/+1
* | Start RelNotes for 1.5.4Junio C Hamano2007-09-241-0/+21
* | Merge branch 'jn/web'Junio C Hamano2007-09-231-36/+2
|\ \
| * | gitweb: No difftree output for trivial mergeJakub Narebski2007-09-231-1/+1
| * | gitweb: Remove parse_from_to_diffinfo code from git_patchset_bodyJakub Narebski2007-09-231-35/+1
| |/
* | Merge branch 'je/hooks'Junio C Hamano2007-09-234-0/+295
|\ \
| * | Added example hook script to save/restore permissions/ownership.Josh England2007-09-182-1/+215
| * | Add post-merge hook, related documentation, and tests.Josh England2007-09-183-0/+81
* | | Merge branch 'js/apply-build-ancestor'Junio C Hamano2007-09-233-21/+31
|\ \ \
| * | | apply: get rid of --index-info in favor of --build-fake-ancestorJohannes Schindelin2007-09-183-21/+31
| |/ /
* | | Merge branch 'maint'Junio C Hamano2007-09-2325-38/+252
|\ \ \ | | |/ | |/|
| * | Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maintJunio C Hamano2007-09-231-7/+213
| |\ \
| | * | User Manual: add a chapter for submodulesMiklos Vajna2007-09-231-0/+202
| | * | user-manual: don't assume refs are stored under .git/refsJ. Bruce Fields2007-09-231-7/+11
| * | | git-svn: don't attempt to spawn pager if we don't want oneEric Wong2007-09-231-1/+1
| * | | Supplant the "while case ... break ;; esac" idiomDavid Kastrup2007-09-2319-23/+23
| * | | Detect exec bit in more cases.David Brown2007-09-221-1/+9
| * | | Conjugate "search" correctly in the git-prune-packed man page.Matt Kraai2007-09-211-1/+1
| * | | Move the paragraph specifying where the .idx and .pack files should beMatt Kraai2007-09-211-4/+4
| * | | Documentation/git-lost-found.txt: drop unnecessarily duplicated name.Junio C Hamano2007-09-211-1/+1
| |/ /
* | | rev-list --bisect: Fix best == NULL case.Christian Couder2007-09-201-3/+3
* | | Merge branch 'maint' to sync with 1.5.3.2Junio C Hamano2007-09-192-0/+59
|\ \ \ | |/ / | | / | |/ |/|
| * GIT 1.5.3.2v1.5.3.2Junio C Hamano2007-09-193-2/+60
* | Merge branch 'maint'Junio C Hamano2007-09-188-17/+31
|\ \ | |/
| * Fixed update-hook example allow-users format.Väinö Järvelä2007-09-181-4/+4
| * Documentation/git-svn: updated design philosophy notesEric Wong2007-09-181-5/+6
| * t/t4014: test "am -3" with mode-only change.Junio C Hamano2007-09-181-2/+5
| * Fix lapsus in builtin-apply.cPierre Habouzit2007-09-181-1/+1
| * git-push: documentation and tests for pushing only branchesJeff King2007-09-183-4/+14
| * git-svnimport: Use separate arguments in the pipe for git-rev-parseMatthias Urlichs2007-09-181-1/+1
* | git-commit.sh: Shell script cleanupDavid Kastrup2007-09-181-58/+14
* | preserve executable bits in zip archivesDmitry Potapov2007-09-181-2/+4
* | contrib/fast-import: add perl version of simple exampleJeff King2007-09-181-0/+64
* | contrib/fast-import: add simple shell exampleNguyen Thai Ngoc Duy2007-09-181-0/+38
* | rev-list --bisect: Bisection "distance" clean up.Christian Couder2007-09-181-11/+7
* | rev-list --bisect: Move some bisection code into best_bisection.Christian Couder2007-09-181-17/+26
* | rev-list --bisect: Move finding bisection into do_find_bisection.Christian Couder2007-09-181-42/+48
* | Merge branch 'cr/reset'Junio C Hamano2007-09-1814-44/+718
|\ \
| * \ Merge branch 'jc/cachetree' into cr/resetJunio C Hamano2007-09-1411-81/+184
| |\ \
| | * | Simplify cache APIJunio C Hamano2007-09-146-19/+4
| * | | An additional test for "git-reset -- path"Junio C Hamano2007-09-131-0/+16
| * | | Make "git reset" a builtin.Carlos Rica2007-09-125-1/+283
| * | | Move make_cache_entry() from merge-recursive.c into read-cache.cCarlos Rica2007-09-123-24/+26
| * | | Add tests for documented features of "git reset".Carlos Rica2007-09-121-0/+389
* | | | Merge branch 'maint'Junio C Hamano2007-09-189-49/+304
|\ \ \ \ | | |_|/ | |/| |