summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/cherry'Junio C Hamano2006-11-017-26/+139
|\
| * Make git-cherry handle root treesRene Scharfe2006-10-264-24/+29
| * Built-in cherryRene Scharfe2006-10-235-93/+110
* | Merge branch 'jc/refs-and-fetch'Junio C Hamano2006-11-011-4/+4
|\ \
| * | git-fetch: adjust to packed-refs.Junio C Hamano2006-10-011-4/+4
| * | Merge branch 'sb/fetch' into jc/refs-and-fetchJunio C Hamano2006-10-0122-255/+1202
| |\ \
* | \ \ Merge branch 'lj/refs'Junio C Hamano2006-11-0145-536/+1475
|\ \ \ \
| * \ \ \ Merge branch 'jc/reflog' into lj/refsJunio C Hamano2006-10-263-20/+32
| |\ \ \ \
| | * | | | sha1_name.c: avoid compilation warnings.Junio C Hamano2006-10-231-1/+1
| | * | | | ref-log: allow ref@{count} syntax.Junio C Hamano2006-10-053-20/+32
| * | | | | Fix show-ref usagestringLars Hjemli2006-10-261-1/+1
| * | | | | t3200: git-branch testsuite updateJunio C Hamano2006-10-231-6/+3
| * | | | | Make git-branch a builtinLars Hjemli2006-10-235-132/+223
| * | | | | ref-log: fix D/F conflict coming from deleted refs.Junio C Hamano2006-10-192-2/+14
| * | | | | git-revert with conflicts to behave as git-merge with conflictsLuben Tuikov2006-10-152-3/+12
| * | | | | core.logallrefupdates thinko-fixJunio C Hamano2006-10-091-1/+1
| * | | | | git-pack-refs --allJunio C Hamano2006-10-082-10/+15
| * | | | | core.logallrefupdates create new log file only for branch heads.Junio C Hamano2006-10-082-7/+12
| * | | | | Remove bashism from t3210-pack-refs.shDennis Stosberg2006-10-061-1/+1
| |/ / / /
| * | | | pack-refs: call fflush before fsync.Junio C Hamano2006-10-041-0/+1
| * | | | pack-refs: use lockfile as everybody else does.Junio C Hamano2006-10-031-17/+4
| * | | | git-fetch: do not look into $GIT_DIR/refs to see if a tag exists.Junio C Hamano2006-10-031-1/+1
| * | | | Merge branch 'master' into lj/refsJunio C Hamano2006-10-0237-322/+3028
| |\ \ \ \
| | * | | | lock_ref_sha1_basic does not remove empty directories on BSDDennis Stosberg2006-10-021-0/+6
| * | | | | Do not create tag leading directories since git update-ref does it.Christian Couder2006-10-011-3/+2
| * | | | | Check that a tag exists using show-ref instead of looking for the ref file.Christian Couder2006-10-011-1/+1
| * | | | | Use git-update-ref to delete a tag instead of rm()ing the ref file.Christian Couder2006-10-011-2/+4
| * | | | | Fix refs.c;:repack_without_ref() clean-up pathJunio C Hamano2006-10-011-1/+2
| * | | | | Clean up "git-branch.sh" and add remove recursive dir test cases.Christian Couder2006-10-012-10/+27
| * | | | | Fix a remove_empty_dir_recursive problem.Christian Couder2006-10-011-1/+1
| | |/ / / | |/| | |
| * | | | show-ref --hash=len, --abbrev=len, and --abbrevJunio C Hamano2006-10-012-8/+39
| * | | | git-branch: remove D/F check done by hand.Junio C Hamano2006-09-301-10/+0
| * | | | delete_ref(): delete packed refJunio C Hamano2006-09-301-32/+77
| * | | | lock_ref_sha1(): check D/F conflict with packed ref when creating.Junio C Hamano2006-09-301-0/+24
| * | | | lock_ref_sha1(): do not sometimes error() and sometimes die().Junio C Hamano2006-09-301-8/+18
| * | | | refs: minor restructuring of cached refs data.Junio C Hamano2006-09-301-13/+43
| * | | | ref locking: allow 'foo' when 'foo/bar' used to exist but not anymore.Junio C Hamano2006-09-301-0/+64
| * | | | Uncomment test case: git branch c/d should barf if branch c exists.Christian Couder2006-09-271-6/+6
| * | | | When creating branch c/d check that branch c does not already exists.Christian Couder2006-09-271-0/+10
| * | | | Add pack-refs and show-ref test cases.Christian Couder2006-09-271-0/+70
| * | | | Merge branch 'master' into lj/refsJunio C Hamano2006-09-2770-1611/+2330
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/for-each-ref' into jc/ref-lockingJunio C Hamano2006-09-271-4/+21
| |\ \ \ \ \
| * | | | | | receive-pack: call setup_ident before git_configJunio C Hamano2006-09-271-0/+1
| * | | | | | Teach receive-pack about ref-logJunio C Hamano2006-09-271-73/+15
| * | | | | | update a few Porcelain-ish for ref lock safety.Junio C Hamano2006-09-273-9/+13
| * | | | | | update-ref: -d flag and ref creation safety.Junio C Hamano2006-09-274-5/+50
| * | | | | | Clean-up lock-ref implementationJunio C Hamano2006-09-275-12/+11
| * | | | | | Merge branch 'jc/lt-ref2-with-lt-refs' into jc/ref-lockingJunio C Hamano2006-09-278-4/+281
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'lt/refs' into jc/lt-ref2-with-lt-refsJunio C Hamano2006-09-2169-949/+2767
| | |\ \ \ \ \ \
| | * | | | | | | Fix show-ref usage for --dereference.Christian Couder2006-09-201-1/+1