summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into js/shallowJunio C Hamano2006-12-27226-6240/+9288
|\
| * count-objects -v: show number of packs as well.Junio C Hamano2006-12-272-2/+5
| * Merge branch 'jc/fsck-reflog'Junio C Hamano2006-12-2615-32/+373
| |\
| | * Add git-reflog to .gitignoreNicolas Pitre2006-12-261-0/+1
| | * reflog expire: do not punt on tags that point at non commits.Junio C Hamano2006-12-221-5/+5
| | * reflog expire: prune commits that are not incompleteJunio C Hamano2006-12-221-3/+40
| | * Don't crash during repack of a reflog with pruned commits.Shawn O. Pearce2006-12-211-10/+20
| | * Merge branch 'master' into jc/fsck-reflogJunio C Hamano2006-12-2112-29/+81
| | |\
| | * | git reflog expireJunio C Hamano2006-12-204-0/+178
| | * | Move in_merge_bases() to commit.cJunio C Hamano2006-12-203-20/+19
| | * | reflog: fix warning message.Junio C Hamano2006-12-201-3/+9
| | * | Teach git-repack to preserve objects referred to by reflog entries.Junio C Hamano2006-12-203-9/+52
| | * | Protect commits recorded in reflog from pruning.Junio C Hamano2006-12-202-0/+38
| | * | add for_each_reflog_ent() iteratorJunio C Hamano2006-12-202-0/+29
| * | | everyday: update for v1.5.0Junio C Hamano2006-12-261-41/+48
| * | | git-svn: dcommit should diff against the current HEAD after committingEric Wong2006-12-261-3/+3
| * | | git-svn: quiet down tests and fix some unportable shell constructsEric Wong2006-12-261-131/+127
| * | | hooks/commit-msg: add example to add Signed-off-by line to messageAndy Parkins2006-12-261-0/+4
| * | | move git-blame to its place in .gitignoreNicolas Pitre2006-12-261-1/+1
| * | | Document git-reset <commit> -- <paths>...Junio C Hamano2006-12-261-3/+9
| * | | Document --numstat in git-apply and git-diffJunio C Hamano2006-12-262-3/+6
| * | | show-branch --reflog: add documentation.Junio C Hamano2006-12-261-0/+5
| * | | add .mailmap for git-shortlog output with the git repositoryNicolas Pitre2006-12-251-0/+37
| * | | GIT v1.5.0 previewv1.5.0-rc0Junio C Hamano2006-12-251-1/+1
| * | | Merge branch 'jc/bm'Junio C Hamano2006-12-251-2/+6
| |\ \ \
| | * | | Allow branch.*.merge to talk about remote tracking branches.Junio C Hamano2006-12-241-2/+6
| * | | | Merge branch 'rf/web'Junio C Hamano2006-12-251-96/+107
| |\ \ \ \
| | * | | | gitweb: Use rev-list --skip option.Robert Fitzsimons2006-12-251-23/+1
| | * | | | gitweb: Change history action to use parse_commits.Robert Fitzsimons2006-12-251-18/+9
| | * | | | gitweb: Change atom, rss actions to use parse_commits.Robert Fitzsimons2006-12-251-11/+7
| | * | | | gitweb: Change header search action to use parse_commits.Robert Fitzsimons2006-12-251-14/+9
| | * | | | gitweb: Change log action to use parse_commits.Robert Fitzsimons2006-12-251-11/+14
| | * | | | gitweb: Change summary, shortlog actions to use parse_commits.Robert Fitzsimons2006-12-251-22/+12
| | * | | | gitweb: We do longer need the --parents flag in rev-list.Robert Fitzsimons2006-12-251-5/+6
| | * | | | gitweb: Add parse_commits, used to bulk load commit objects.Robert Fitzsimons2006-12-251-17/+74
| * | | | | git-add -f: allow adding otherwise ignored files.Junio C Hamano2006-12-252-7/+35
| * | | | | git-add: warn when adding an ignored file with an explicit request.Junio C Hamano2006-12-251-0/+3
| * | | | | git-add: add ignored files when asked explicitly.Junio C Hamano2006-12-252-4/+18
| * | | | | read_directory: show_both option.Junio C Hamano2006-12-252-9/+16
| * | | | | git-rm: DocumentationJunio C Hamano2006-12-251-24/+27
| * | | | | t3600: update the test for updated git rmJunio C Hamano2006-12-251-4/+74
| * | | | | git-rm: update to saner semanticsJunio C Hamano2006-12-251-20/+103
| * | | | | match_pathspec() -- return how well the spec matchedJunio C Hamano2006-12-252-16/+39
| |/ / / /
| * | | | Merge branch 'jc/skip-count'Junio C Hamano2006-12-254-14/+89
| |\ \ \ \
| | * | | | revision: --skip=<n>Junio C Hamano2006-12-204-14/+89
| * | | | | Merge branch 'jc/git-add--interactive'Junio C Hamano2006-12-255-2/+940
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | git-add --interactive: add documentationJunio C Hamano2006-12-252-2/+119
| | * | | | git-add --interactive: hunk splittingJunio C Hamano2006-12-181-8/+242
| | * | | | git-add --interactiveJunio C Hamano2006-12-184-0/+587
| * | | | | Merge branch 'sb/merge-friendly'Junio C Hamano2006-12-243-6/+23
| |\ \ \ \ \