summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mk/maint-cg-push'Junio C Hamano2008-11-123-5/+75
|\
| * git push: Interpret $GIT_DIR/branches in a Cogito compatible wayMartin Koegler2008-11-113-5/+75
* | Merge branch 'bc/maint-keep-pack'Junio C Hamano2008-11-127-27/+116
|\ \
| * | t7700: test that 'repack -a' packs alternate packed objectsBrandon Casey2008-11-121-0/+16
| * | pack-objects: extend --local to mean ignore non-local loose objects tooBrandon Casey2008-11-123-2/+5
| * | sha1_file.c: split has_loose_object() into local and non-local counterpartsBrandon Casey2008-11-122-6/+14
| * | t7700: demonstrate mishandling of loose objects in an alternate ODBBrandon Casey2008-11-121-0/+19
| * | builtin-gc.c: use new pack_keep bitfield to detect .keep file existenceBrandon Casey2008-11-121-11/+1
| * | repack: do not fall back to incremental repacking with [-a|-A]Brandon Casey2008-11-121-7/+4
| * | repack: don't repack local objects in packs with .keep fileBrandon Casey2008-11-122-2/+2
| * | pack-objects: new option --honor-pack-keepBrandon Casey2008-11-122-0/+12
| * | packed_git: convert pack_local flag into a bitfield and add pack_keepBrandon Casey2008-11-122-1/+7
| * | t7700: demonstrate mishandling of objects in packs with a .keep fileBrandon Casey2008-11-121-0/+38
| |/
* | Merge branch 'mv/remote-rename'Junio C Hamano2008-11-125-0/+256
|\ \
| * | git-remote: document the migration feature of the rename subcommandMiklos Vajna2008-11-111-0/+4
| * | git-remote rename: migrate from remotes/ and branches/Miklos Vajna2008-11-112-0/+68
| * | remote: add a new 'origin' variable to the structMiklos Vajna2008-11-112-0/+10
| * | Implement git remote renameMiklos Vajna2008-11-053-0/+174
* | | Merge branch 'jk/deny-push-to-current'Junio C Hamano2008-11-123-29/+126
|\ \ \
| * | | receive-pack: detect push to current branch of non-bare repoJeff King2008-11-093-0/+105
| * | | t5516: refactor oddball testsJeff King2008-11-091-29/+21
* | | | Merge branch 'dl/xdiff'Junio C Hamano2008-11-121-2/+13
|\ \ \ \
| * | | | xdiff: give up scanning similar lines earlyDavide Libenzi2008-11-081-2/+13
| | |/ / | |/| |
* | | | Merge branch 'lt/decorate'Junio C Hamano2008-11-128-14/+113
|\ \ \ \
| * | | | rev-list documentation: clarify the two parts of history simplificationSanti Béjar2008-11-121-2/+46
| * | | | Document "git log --simplify-by-decoration"Nanako Shiraishi2008-11-121-0/+8
| * | | | Document "git log --source"Nanako Shiraishi2008-11-111-0/+4
| * | | | revision traversal: '--simplify-by-decoration'Linus Torvalds2008-11-042-0/+28
| * | | | Make '--decorate' set an explicit 'show_decorations' flagLinus Torvalds2008-11-043-2/+4
| * | | | revision: make tree comparison functions take commits rather than treesLinus Torvalds2008-11-041-5/+9
| * | | | Add a 'source' decorator for commitsLinus Torvalds2008-11-046-5/+14
* | | | | Merge branch 'jk/diff-convfilter'Junio C Hamano2008-11-129-42/+81
|\ \ \ \ \
| * | | | | enable textconv for diff in verbose status/commitJeff King2008-10-262-0/+9
| * | | | | wt-status: load diff ui configJeff King2008-10-262-1/+17
| * | | | | only textconv regular filesJeff King2008-10-262-1/+3
| * | | | | userdiff: require explicitly allowing textconvJeff King2008-10-267-27/+17
| * | | | | refactor userdiff textconv codeJeff King2008-10-262-16/+38
* | | | | | Merge branch 'jk/diff-convfilter-test-fix'Junio C Hamano2008-11-127-20/+178
|\ \ \ \ \ \
| * | | | | | Avoid using non-portable `echo -n` in tests.Brian Gernhardt2008-10-315-7/+7
| |/ / / / /
| * | | | | add userdiff textconv testsJeff King2008-10-261-0/+118
| * | | | | document the diff driver textconv featureJeff King2008-10-261-13/+53
| * | | | | diff: add missing static declarationJeff King2008-10-261-1/+1
* | | | | | Merge branch 'st/tag'Junio C Hamano2008-11-122-7/+23
|\ \ \ \ \ \
| * | | | | | tag: Add more tests about mixing incompatible modes and optionsSamuel Tardieu2008-11-041-0/+11
| * | | | | | tag: Check that options are only allowed in the appropriate modeSamuel Tardieu2008-11-041-7/+12
* | | | | | | Merge git://repo.or.cz/git-guiJunio C Hamano2008-11-124-17/+41
|\ \ \ \ \ \ \
| * | | | | | | git-gui: Request blame metadata in utf-8.Alexander Gavrilov2008-11-111-1/+1
| * | | | | | | git-gui: Add the Show SSH Key item to the clone dialog.Alexander Gavrilov2008-11-112-9/+17
| * | | | | | | git-gui: Fix focus transition in the blame viewer.Alexander Gavrilov2008-11-112-7/+23
* | | | | | | | git.html: Update the links to stale versionsJunio C Hamano2008-11-121-1/+3
View Lorry Controller Status