?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
Merge branch 'jc/diff'
2006-02-06 Junio C HamanoMerge branch 'jc/diff'
 commit | commitdiff | tree
2006-02-06 Junio C HamanoMerge branches 'lt/show' and 'lt/revlist'
 commit | commitdiff | tree
2006-02-06 Junio C HamanoMerge branches 'jc/daemon' and 'mw/http'
 commit | commitdiff | tree
2006-02-06 Junio C Hamanogit-diff-tree --stdin: show all parents.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-06 Junio C Hamanocombine-diff: remove misguided --show-empty hack.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-06 Junio C Hamanodaemon: extend user-relative path notation.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-06 Junio C Hamanodaemon: do not forbid user relative paths unconditionally...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-06 Junio C Hamanogit-show
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-06 Junio C Hamanogit-diff: use --cc instead of -p.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-06 Junio C Hamanodiff-index: make --cc a synonym for -p for now.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-05 Junio C HamanoDo not fall back on vi on dumb terminals.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-04 Junio C HamanoMerge branches 'jc/sha1', 'jc/diff' and 'jc/ws'
 commit | commitdiff | tree
2006-02-04 Junio C Hamanogit-merge: Properly quote $merge_msg variable.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-03 Junio C Hamanoget_sha1_1: allow octopus^12 to be properly parsed.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-03 Junio C Hamanowhitespace cleanup.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-03 Junio C Hamanocombine-diff: finishing touches to git-diff-tree --cc
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-03 Junio C Hamanocombine-diff: cleanup.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-03 Junio C Hamanocombine-diff: show parent line numbers as well.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-03 Junio C Hamanocombine-diff: add a bit more comments.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-03 Junio C Hamanocommit.c: "Merge" fix in pretty_print_commit.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-02 Junio C HamanoDocumentation: git-diff-tree --cc also omits empty...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-02 Junio C Hamanocombine-diff: fix placement of deletion.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-02 Junio C Hamanocombine-diff: add safety check to --cc.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-02 Junio C Hamanocombine-diff: update --cc "uninteresting hunks" logic.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-02 Junio C Hamanocombine-diff: reuse diff from the same blob.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-02 Junio C Hamanorev-list: omit duplicated parents.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-02-02 Junio C Hamanoupdate-index --index-info: allow stage 0 entries.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-31 Junio C HamanoMerge branches 'bf/doc' and 'db/tartree'
 commit | commitdiff | tree
2006-01-31 Junio C Hamanodocumentation: cvs migration - typofix.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-30 Junio C HamanoMerge fixes up to GIT 1.1.6
 commit | commitdiff | tree
2006-01-30 Junio C HamanoGIT 1.1.6
 commit | commitdiff | tree
2006-01-29 Junio C Hamano[PATCH] pre-commit sample hook: do not barf on the...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C HamanoDocumentation: diff -c/--cc
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C Hamanodiff-files -c/--cc: combine only when both ours and...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C HamanoMerge lt/revlist,jc/diff,jc/revparse,jc/abbrev
 commit | commitdiff | tree
2006-01-28 Junio C Hamanorev-parse: make "whatchanged -- git-fetch-script" work...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C Hamanodiff --abbrev=<n> option fix.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C Hamanopretty_print_commit: honor grafts.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C Hamanopretty_print_commit(): pass commit object instead of...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C HamanoRename rev-parse --abbrev to --short.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C Hamanorev-parse --abbrev: do not try abbrev shorter than...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C Hamanodiff-tree: abbreviate merge parent object names with...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C Hamanorev-parse: --abbrev option.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C Hamanoabbrev cleanup: use symbolic constants
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C Hamanorev-list --remove-empty: add minimum help and doc entry.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C Hamanodiff-files: -c and --cc options.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C Hamanocombine-diff: better hunk splitting.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C Hamanodiff-tree --cc: squelch header generation on empty...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C Hamanocombine-diff: extend --cc logic to Octopus.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C Hamanocombine-diff: minor output changes.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C Hamanocombine-diff: fix appending at the tail of a list.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C Hamanodiff-tree --cc: denser combined diff output for a merge...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C Hamanodiff-tree -c: show a merge commit a bit more sensibly.
 Author: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-28 Junio C Hamanomerge: seed the commit message with list of conflicted...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-27 Junio C HamanoMerge fixes up to GIT 1.1.5
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-27 Junio C HamanoGIT 1.1.5
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-27 Junio C HamanoGIT 1.0.13
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-27 Junio C Hamanocheckout: do not make a temporary copy of symlink target.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-27 Junio C Hamanogit-fetch --upload-pack: disambiguate.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-25 Junio C Hamanotests: adjust breakage by stricter rev-parse
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-25 Junio C HamanoMerge branches 'jc/clone', 'md/env' and 'mo/path'
 commit | commitdiff | tree
2006-01-25 Junio C Hamanoclone: do not accept more than one -o option.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-25 Junio C Hamanoclone: do not create remotes/origin nor origin branch...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-25 Junio C Hamanogit-clone: PG13 --naked option to --bare.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-25 Junio C Hamanosample update-hook: sanely handle a new branch head.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-23 Junio C HamanoDocumentation: finishing touches to the new tutorial.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-23 Junio C HamanoRecommend to remove unused `origin` in a shared repository.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-22 Junio C Hamanogit-grep: clarification on parameters.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-22 Junio C HamanoUndef DT_* before redefining them.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-22 Junio C Hamanot4011: "sleep 1" is not enough on FAT
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-22 Junio C HamanoDT_UNKNOWN: do not fully trust existence of DT_UNKNOWN
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-22 Junio C Hamanofsck-objects: support platforms without d_ino in struct...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-22 Junio C HamanoMakefile: do not assume lack of IPV6 means no sockaddr_storage.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-21 Junio C HamanoRevert "git-push: avoid falling back on pushing "matching...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-20 Junio C HamanoMerge fixes up to GIT 1.1.4
 commit | commitdiff | tree
2006-01-20 Junio C HamanoGIT 1.1.4
 commit | commitdiff | tree
2006-01-20 Junio C HamanoGIT 1.0.12
 commit | commitdiff | tree
2006-01-20 Junio C HamanoRevert "check_packed_git_idx(): check integrity of...
commit | commitdiff | tree
2006-01-16 Junio C HamanoAllow building of RPM from interim snapshot.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-16 Junio C Hamanogit-push: fix --tags and document it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-16 Junio C HamanoMerge fixes up to GIT 1.1.3
 commit | commitdiff | tree
2006-01-16 Junio C HamanoGIT 1.1.3
 commit | commitdiff | tree
2006-01-16 Junio C Hamanodescribe: omit clearing marks on the last one.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-16 Junio C HamanoMerge branch 'fix'
 commit | commitdiff | tree
2006-01-16 Junio C Hamanocvsimport: ease migration from CVSROOT/users format
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-16 Junio C HamanoMerge branch 'fixo/1.0'
 commit | commitdiff | tree
2006-01-16 Junio C HamanoGIT 1.0.11
 commit | commitdiff | tree
2006-01-16 Junio C Hamanodiffcore-break/diffcore-rename: integer overflow.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-15 Junio C HamanoMerge branches 'jc/checkout', 'jc/format-patch', 'jc...
commit | commitdiff | tree
2006-01-15 Junio C Hamanoshow-branch: --current includes the current branch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-15 Junio C Hamanoshow-branch: make the current branch and merge commits...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-15 Junio C HamanoDocumentation: show-branch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-15 Junio C Hamanooctopus: allow manual resolve on the last round.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-15 Junio C Hamano[PATCH] format-patch: always --mbox and show sane Date:
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-15 Junio C Hamanoclone: --naked option.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-14 Junio C Hamano[PATCH] checkout: show dirty state upon switching branches.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-14 Junio C Hamanogit-push: avoid falling back on pushing "matching"...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-14 Junio C Hamanocheckout: merge local modifications while switching...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-14 Junio C Hamanocheckout: automerge local changes while switching branches.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2006-01-14 Junio C HamanoMerge fixes up to GIT 1.1.2
 commit | commitdiff | tree
next
Jonathan Nieder’s miscellaneous git branches