Commit Graph

  • 921d865ea2 Teach git-rev-parse about revision-specifying arguments Linus Torvalds 2005-06-13 11:14:20 -07:00
  • d6cb5e5f99 git-whatchanged: use the git-rev-parse helper Linus Torvalds 2005-06-13 10:22:39 -07:00
  • 8ebb018402 git-rev-parse: split "revs" and "non-revs" Linus Torvalds 2005-06-13 10:21:11 -07:00
  • f04b05697c Make "git log" use the new git-rev-parse helper Linus Torvalds 2005-06-13 10:07:25 -07:00
  • 178cb24338 Add 'git-rev-parse' helper script Linus Torvalds 2005-06-13 10:06:50 -07:00
  • 84fb9a4dca git-apply: fix error handling for nonexistent files Linus Torvalds 2005-06-12 21:04:27 -07:00
  • 9718a00b90 [PATCH] git cvsimport fuzz argument Tommy M. McGuire 2005-06-10 01:38:32 -05:00
  • 1cc92ff6ca [PATCH] cvs-migration.txt Tommy M. McGuire 2005-06-10 01:33:44 -05:00
  • 861cb6f02c [PATCH] git cvsimport sanity checking Tommy M. McGuire 2005-06-10 01:27:47 -05:00
  • 667628d97a [PATCH] cvsimport: allow remote CVS repos Tommy M. McGuire 2005-06-10 01:22:06 -05:00
  • 9939664a0b [PATCH] diff-stages: unuglify the too big main() function. Junio C Hamano 2005-06-10 18:44:36 -07:00
  • 036d51cc55 [PATCH] read-tree: loosen too strict index requirements Junio C Hamano 2005-06-11 02:53:57 -07:00
  • 32192e6622 [PATCH] Finish making --emu23 equivalent to pure 2-way merge. Junio C Hamano 2005-06-11 02:50:51 -07:00
  • e7f9bc411c [PATCH] read-tree: fix too strong index requirement #5ALT Junio C Hamano 2005-06-10 18:37:47 -07:00
  • 03efa6d9a4 [PATCH] read-tree --emu23. Junio C Hamano 2005-06-10 18:36:08 -07:00
  • 76bc82ca0e [PATCH] Clean up read-tree two-way tests. Junio C Hamano 2005-06-10 18:34:34 -07:00
  • f2ce9fde57 [PATCH] Add --diff-filter= output restriction to diff-* family. Junio C Hamano 2005-06-11 20:57:13 -07:00
  • a7ca65405c [PATCH] diff-tree: --find-copies-harder Junio C Hamano 2005-06-10 18:31:02 -07:00
  • d327b89a22 [PATCH] Tutorial update to adjust for -B fix Junio C Hamano 2005-06-03 12:11:07 -07:00
  • 2210100ac0 [PATCH] Fix rename/copy when dealing with temporarily broken pairs. Junio C Hamano 2005-06-11 20:55:20 -07:00
  • a7fa68c5f9 git-whatchanged: make default output format be pretty. Linus Torvalds 2005-06-12 20:35:04 -07:00
  • ba88e54b1a git-diff-tree: fix output with just "--pretty". Linus Torvalds 2005-06-12 20:34:09 -07:00
  • a8db165ee9 [PATCH] Support commit_format in diff-tree Junio C Hamano 2005-06-12 17:44:21 -07:00
  • dc7090efbc [PATCH] Re-Fix SIGSEGV on unmerged files in git-diff-files -p Junio C Hamano 2005-06-12 17:23:15 -07:00
  • 206de27efa git-apply: ignore empty git headers Linus Torvalds 2005-06-12 09:37:49 -07:00
  • 025a0709b6 [PATCH] Bugfix: read-cache.c:write_cache() misrecords number of entries. Junio C Hamano 2005-06-10 01:32:37 -07:00
  • c2f6a02251 Show heads as well as tags Paul Mackerras 2005-06-10 07:54:49 +00:00
  • aa16021efc git-read-tree: remove deleted files in the working directory Linus Torvalds 2005-06-09 15:34:04 -07:00
  • 22f77b772d [PATCH] Add git-diff-stages command. Junio C Hamano 2005-06-09 15:13:13 -07:00
  • 438195cced git-read-tree: add "--reset" flag Linus Torvalds 2005-06-09 12:51:01 -07:00
  • 98a96b00b8 One more time.. Clean up git-merge-one-file-script Linus Torvalds 2005-06-08 17:56:09 -07:00
  • e0226add28 Fix up git-merge-one-file-script Linus Torvalds 2005-06-08 17:36:47 -07:00
  • 566487c8a6 Merge my and Petr's git-merge-one-file-script modifications Linus Torvalds 2005-06-08 16:54:23 -07:00
  • ec73962d8e [PATCH] git-merge-one-file-script cleanups from Cogito Petr Baudis 2005-06-09 01:38:20 +02:00
  • ae3858e7e9 Make sure we error out if we can't remove a file on automatic merges. Linus Torvalds 2005-06-08 16:35:30 -07:00
  • 17ebe977d7 [PATCH] Tidy up some rev-list-related stuff Petr Baudis 2005-06-08 22:59:43 +02:00
  • f225b21807 [PATCH] Add read-tree -m 3-way merge tests. Junio C Hamano 2005-06-08 14:55:35 -07:00
  • 8544a6f1b8 [PATCH] Fix git-merge-one-file permissions auto-merging Petr Baudis 2005-06-08 23:26:55 +02:00
  • 7f1d112962 Remove MERGE_HEAD after committing merge Linus Torvalds 2005-06-08 13:44:32 -07:00
  • 9c065315f7 Make "git commit" work correctly in the presense of a manual merge Linus Torvalds 2005-06-08 13:33:15 -07:00
  • 3c65eb1849 cvs-migration: add more of a header to the "annotate" discussion Linus Torvalds 2005-06-08 13:19:31 -07:00
  • 1ae4ee8942 [PATCH] Miniscule correction of diff-format.txt Christian Meder 2005-06-02 11:55:03 +02:00
  • 5d6ccf5ce7 [PATCH] Anal retentive 'const unsigned char *sha1' Jason McMullan 2005-06-03 11:05:39 -04:00
  • e0f0e891c1 [PATCH] git-diff-cache: handle pathspec beginning with a dash Jonas Fonseca 2005-06-06 23:27:00 +02:00
  • 2a68a8659f Leave merge failures in the filesystem Linus Torvalds 2005-06-08 11:40:59 -07:00
  • f9e7750621 Fix SIGSEGV on unmerged files in git-diff-files -p Linus Torvalds 2005-06-08 11:31:53 -07:00
  • 7d95ee9351 [PATCH] Tests: read-tree -m test updates. Junio C Hamano 2005-06-08 02:08:54 -07:00
  • 5b1ea09de1 Make default merge messages denser. Linus Torvalds 2005-06-08 10:09:41 -07:00
  • 4e7346735a [PATCH] three --merge-order bug fixes Jon Seymour 2005-06-09 00:37:41 +10:00
  • 32798c707e [PATCH] git-cvs2git: create tags Sven Verdoolaege 2005-06-01 13:27:23 +02:00
  • af3f929f95 git-apply: creatign empty files is nonfatal Linus Torvalds 2005-06-08 08:11:47 -07:00
  • fcbfd5a6b2 Talk about "git cvsimport" in the cvs migration docs Linus Torvalds 2005-06-07 15:52:06 -07:00
  • 28f8fafff8 [PATCH] Documentation: describe diff tweaking (fix). Junio C Hamano 2005-06-05 17:54:10 -07:00
  • b0bf8f24e9 [PATCH] Start cvs-migration documentation Junio C Hamano 2005-06-05 17:46:06 -07:00
  • a57f0b58d7 git-read-tree: -u without -m is meaningless. Don't allow it. Linus Torvalds 2005-06-07 15:20:39 -07:00
  • b5b425074e git-read-tree: make one-way merge also honor the "update" flag Linus Torvalds 2005-06-07 15:17:33 -07:00
  • ccef66b55a [PATCH] read-tree: update documentation for 3-way merge. Junio C Hamano 2005-06-07 14:35:43 -07:00
  • d4f8b390a4 Add CVS import scripts and programs Linus Torvalds 2005-06-07 15:11:28 -07:00
  • 001d4a27db git-ssh-push/pull: usability improvements Linus Torvalds 2005-06-07 14:23:46 -07:00
  • 972d1bb067 [PATCH] Use ntohs instead of htons to convert ce_flags to host byte order Timo Hirvonen 2005-06-07 20:35:56 +00:00
  • c859600954 [PATCH] read-tree: save more user hassles during fast-forward. Junio C Hamano 2005-06-07 11:36:30 -07:00
  • 63aff4fed9 [PATCH] Document git-ssh-pull and git-ssh-push Daniel Barkalow 2005-06-06 22:30:39 -04:00
  • e5b905c448 git-resolve-script: stop when the automated merge fails Linus Torvalds 2005-06-06 19:37:25 -07:00
  • ed37b5b2b9 Make fetch/pull scripts terminate cleanly on errors Linus Torvalds 2005-06-06 17:40:22 -07:00
  • 3f4eff7530 git-resolve-script: don't wait for three seconds any more Linus Torvalds 2005-06-06 17:39:14 -07:00
  • c7c4bbe631 [PATCH] -w support for git-ssh-pull/push Daniel Barkalow 2005-06-06 16:43:27 -04:00
  • cd541a68b3 [PATCH] Generic support for pulling refs Daniel Barkalow 2005-06-06 16:38:26 -04:00
  • 9182f89ab2 [PATCH] rsh.c environment variable Daniel Barkalow 2005-06-06 16:35:02 -04:00
  • 95fc75129a [PATCH] Operations on refs Daniel Barkalow 2005-06-06 16:31:29 -04:00
  • 451322512f git-read-tree: some "final" cleanups Linus Torvalds 2005-06-06 14:33:11 -07:00
  • d723c69063 git-read-tree: simplify merge loops enormously Linus Torvalds 2005-06-06 14:01:58 -07:00
  • 96cd5429a4 [PATCH] index locking like everybody else Junio C Hamano 2005-06-06 12:20:55 -07:00
  • 90334cf780 Add "__noreturn__" attribute to die() and usage() Linus Torvalds 2005-06-06 10:12:31 -07:00
  • 64de356299 git-rev-list: make sure to link with ssl libraries Linus Torvalds 2005-06-06 09:09:43 -07:00
  • a3437b8c26 [PATCH] Modify git-rev-list to linearise the commit history in merge order. jon@blackcubes.dyndns.org 2005-06-06 15:39:40 +00:00
  • d925ffbd06 Fix off-by-one in new three-way-merge updates Linus Torvalds 2005-06-05 23:38:18 -07:00
  • c3f13d59f7 [PATCH] 3-way merge tests for new "git-read-tree -m"? Junio C Hamano 2005-06-05 23:18:16 -07:00
  • a76d74fb71 Three-way merge: fix silly bug that made trivial merges not work Linus Torvalds 2005-06-05 23:32:53 -07:00
  • 6ee67f2610 Fix entry.c dependency and compile problem Linus Torvalds 2005-06-05 23:15:40 -07:00
  • e6ee623b7b git-read-tree: fix up two-way merge Linus Torvalds 2005-06-05 22:59:59 -07:00
  • 220a0b527b More work on merging with git-read-tree.. Linus Torvalds 2005-06-05 22:07:31 -07:00
  • 12dccc1654 Make fiel checkout function available to the git library Linus Torvalds 2005-06-05 21:59:54 -07:00
  • 76f38347b4 git-read-tree: fix up three-way merge tests Linus Torvalds 2005-06-05 20:28:33 -07:00
  • 02ede67ad4 git-read-tree: be a lot more careful about merging dirty trees Linus Torvalds 2005-06-05 20:02:31 -07:00
  • 9b63f50148 [PATCH] Make git-update-cache --force-remove regular Petr Baudis 2005-05-31 18:52:43 +02:00
  • 418aaf847a [PATCH] rename git-rpush and git-rpull to git-ssh-push and git-ssh-pull Junio C Hamano 2005-06-05 15:41:05 -07:00
  • dc93841715 diff 'rename' format change. Linus Torvalds 2005-06-05 15:31:52 -07:00
  • f7b797073c git-apply: consider it an error to apply no changes Linus Torvalds 2005-06-05 15:25:28 -07:00
  • 1a93a7662d [PATCH] Documentation: describe git extended diff headers. Junio C Hamano 2005-06-05 14:39:49 -07:00
  • 4a1332d04b [PATCH] Documentation: describe diff tweaking. Junio C Hamano 2005-06-05 14:30:58 -07:00
  • 33f4d087a9 git-apply: fix rename header parsing Linus Torvalds 2005-06-05 14:26:50 -07:00
  • a48e1d67e1 [PATCH] pull: gracefully recover from delta retrieval failure. Junio C Hamano 2005-06-04 23:11:38 -07:00
  • f78c79c5d4 [PATCH] diffcore-break.c: various fixes. Junio C Hamano 2005-06-03 23:05:57 -07:00
  • 49d9e85d11 [PATCH] diff.c: -B argument passing fix. Junio C Hamano 2005-06-03 23:04:07 -07:00
  • 0601e131c9 [PATCH] diff.c: locate_size_cache() fix. Junio C Hamano 2005-06-03 23:02:23 -07:00
  • f48516746f applypatch: use "--index" to actually make git-apply write the changes to the index file. Linus Torvalds 2005-06-05 14:12:53 -07:00
  • 97b865ba79 applypatch: use the new git-apply to apply patches Linus Torvalds 2005-06-05 14:09:03 -07:00
  • 5aa7d94cd6 git-apply: actually apply patches and update the index Linus Torvalds 2005-06-05 14:05:43 -07:00
  • 30996652e7 git-apply: fix apply of a new file Linus Torvalds 2005-06-05 12:43:56 -07:00
  • 6e7c92a91d git-apply: find offset fragments, and really apply them Linus Torvalds 2005-06-05 12:16:32 -07:00