Commit Graph

  • c80522e30f Make merge comment git-pull makes for an octopus a bit prettier. Junio C Hamano 2005-09-13 23:49:55 -0700
  • 4803c2802c Merge branch 'master' of . Junio C Hamano 2005-09-13 22:30:13 -0700
  • 2ba6c47be1 read-tree: fix bogus debugging statement. Junio C Hamano 2005-09-13 22:27:42 -0700
  • 74376a6864 git-merge-recursive: Trivial RE fixes. Junio C Hamano 2005-09-13 21:09:03 -0700
  • daae669949 [PATCH] Use the 'die' function where it is appropriate. Fredrik Kuivinen 2005-09-13 23:41:39 +0200
  • 6511cce24b [PATCH] Use a temporary index file when we merge the common ancestors. Fredrik Kuivinen 2005-09-13 23:41:16 +0200
  • 87a71b65ac [PATCH] Adjust git-merge-recursive.py for the new tool names. Fredrik Kuivinen 2005-09-13 23:40:47 +0200
  • 0d214b6619 [PATCH] Don't output 'Automatic merge failed, ...' Fredrik Kuivinen 2005-09-13 23:40:23 +0200
  • d9a23fa6f7 [PATCH] Be more like the 'resolve' strategy. Fredrik Kuivinen 2005-09-13 23:39:34 +0200
  • ccfd3e9962 [PATCH] Define relative .git/objects/info/alternates semantics. Junio C Hamano 2005-09-13 00:05:22 -0700
  • a5cd85e084 Detect ls-remote failure properly. Junio C Hamano 2005-09-13 13:16:45 -0700
  • ea6ce10681 Updates 2005-09-13 Signed-off-by: Junio C Hamano <junkio@cox.net> Junio C Hamano 2005-09-13 00:27:40 -0700
  • e4cf17ce0d [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. Fredrik Kuivinen 2005-09-13 08:22:26 +0200
  • f88ed172e7 Fix off-by-one error in git-merge Junio C Hamano 2005-09-12 22:20:42 -0700
  • 22c67ca88e Propagate errors from fetch-pack correctly to git-fetch. Junio C Hamano 2005-09-12 22:20:02 -0700
  • 365527adbf Fix CDPATH problem. Junio C Hamano 2005-09-12 19:47:07 -0700
  • 3db6b224cf Merge branch 'master' of . Junio C Hamano 2005-09-12 22:02:42 -0700
  • 2aba319a52 Document git-grep and link it from the main git(7) page. Junio C Hamano 2005-09-12 19:39:15 -0700
  • 7f88c8463c [PATCH] Make 'git checkout' a bit more forgiving when switching branches. Junio C Hamano 2005-09-11 14:12:08 -0700
  • 4a5b63e3e9 [PATCH] Omit patches that have already been merged from format-patch output. Junio C Hamano 2005-09-11 11:35:20 -0700
  • 663a5ed5ca [PATCH] There are several undocumented dependencies Horst von Brand 2005-09-11 20:00:49 -0400
  • 5d9d831a51 Improve "git grep" flags handling Linus Torvalds 2005-09-12 16:46:53 -0700
  • 5486933ce2 Update 2005-09-12 evening. Signed-off-by: Junio C Hamano <junkio@cox.net> Junio C Hamano 2005-09-12 19:03:16 -0700
  • bd4d3c92d7 v245 Kay Sievers 2005-09-13 02:22:51 +0200
  • 25f422fb87 switch to git-rev-list for commit reading Kay Sievers 2005-09-13 02:21:59 +0200
  • 4e48fe3f1c [PATCH] Make the ProgramError class printable. Fredrik Kuivinen 2005-09-12 23:31:56 +0200
  • 206e587cb8 [PATCH] Make sure we die if we don't get enough arguments. Fredrik Kuivinen 2005-09-12 23:31:22 +0200
  • 654291a2ac [PATCH] Introduce a 'die' function. Fredrik Kuivinen 2005-09-12 23:30:47 +0200
  • ace36858d3 [PATCH] Exit with status code 2 if we get an exception. Fredrik Kuivinen 2005-09-12 23:29:54 +0200
  • 8ceba720ba [PATCH] Fix assertion failure when merging common ancestors. Fredrik Kuivinen 2005-09-12 23:29:06 +0200
  • 540bf654d0 Allow finding things that begin with a dash in 'git grep' Junio C Hamano 2005-09-12 13:24:55 -0700
  • f22cc3fcbf [PATCH] Add "git grep" helper Linus Torvalds 2005-09-12 12:06:10 -0700
  • ba8a4970c7 [PATCH] Add note about IANA confirmation Linus Torvalds 2005-09-12 11:23:00 -0700
  • d32bbc4f15 Update 2005-09-11 late night. Junio C Hamano 2005-09-11 23:57:34 -0700
  • d30a8038bc Updates 2005-09-11. Junio C Hamano 2005-09-11 22:13:44 -0700
  • c52b60a2f2 Merge branch 'master' of . Junio C Hamano 2005-09-11 18:58:53 -0700
  • 7fa090844f Use int instead of socklen_t Junio C Hamano 2005-09-11 13:58:41 -0700
  • 65a9289d7e [PATCH] Apply N -> A status change in diff-helper Herbert Xu 2005-09-12 11:03:43 +1000
  • 127bf00f7d [PATCH] archimport - better handling of temp dirs martin@catalyst.net.nz 2005-09-11 21:26:05 +1200
  • 1d4710d06c [PATCH] archimport - use GIT_DIR instead of hardcoded ".git" martin@catalyst.net.nz 2005-09-11 21:26:05 +1200
  • 241b59675f [PATCH] archimport - update in-script doco, options tidyup martin@catalyst.net.nz 2005-09-11 21:26:05 +1200
  • a5c500b76c [PATCH] archimport documentation tidyup martin@catalyst.net.nz 2005-09-11 21:26:05 +1200
  • a4c5f9aab7 [PATCH] archimport documentation update martin@catalyst.net.nz 2005-09-11 21:26:05 +1200
  • e1ccf53a60 [PATCH] Escape asciidoc's built-in em-dash replacement Yasushi SHOJI 2005-09-12 02:29:10 +0900
  • 2c865d9aa7 [PATCH] Fix buffer overflow in ce_flush(). Qingning Huo 2005-09-11 14:27:47 +0100
  • 53e2cc9b9b Prepare 0.99.7 release candidate branch. Junio C Hamano 2005-09-10 18:37:24 -0700
  • 720d150c48 Add a new merge strategy by Fredrik Kuivinen. Junio C Hamano 2005-09-10 17:46:27 -0700
  • 0f69be5376 'git-merge': Documentation. Junio C Hamano 2005-09-09 01:15:47 -0700
  • 2276aa6c09 Use Daniel's read-tree in the merge strategy 'resolve'. Junio C Hamano 2005-09-10 17:56:19 -0700
  • 91063bbc6c Multi-backend merge driver. Junio C Hamano 2005-09-08 13:47:12 -0700
  • bb97a2a804 Plug leak in Daniel's read-tree. Junio C Hamano 2005-09-10 18:14:14 -0700
  • 4d3fe0c5f3 [PATCH] Add debugging help for case #16 to read-tree.c Junio C Hamano 2005-09-06 12:53:56 -0700
  • 2ab706a38f [PATCH] Disable debugging from read-tree. Junio C Hamano 2005-09-05 01:13:36 -0700
  • 3d89cb4f3f [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges. Daniel Barkalow 2005-09-05 02:05:17 -0400
  • ee6566e8d7 [PATCH] Rewrite read-tree Daniel Barkalow 2005-09-05 02:04:48 -0400
  • 680bab3d9a [PATCH] Add function to append to an object_list. Daniel Barkalow 2005-09-05 02:04:18 -0400
  • 77675e2aff [PATCH] Add a function for getting a struct tree for an ent. Daniel Barkalow 2005-09-05 02:03:51 -0400
  • c9d023b2a6 Fix 'git-show-branch --list <head>' Junio C Hamano 2005-09-10 18:24:46 -0700
  • bcfcd1c3d2 Update 2005-09-10 afternoon. Junio C Hamano 2005-09-10 15:28:28 -0700
  • b595ed1478 Add 'git bisect replay/log' documentation. Junio C Hamano 2005-09-10 15:23:09 -0700
  • e204de28e6 Keep bisection log so that it can be replayed later. Junio C Hamano 2005-09-10 15:18:31 -0700
  • 6bac10d89d Fix copy marking from diffcore-rename. Junio C Hamano 2005-09-10 12:42:32 -0700
  • b779d5f009 [PATCH] archimport - add merge detection martin@catalyst.net.nz 2005-09-10 23:42:24 +1200
  • 866ff2f7ce Make sure we have leading directories under refs/{heads,tags} Junio C Hamano 2005-09-10 10:40:47 -0700
  • d5e34380af [PATCH] Documentation/repository-layout.txt typo Sven Verdoolaege 2005-09-10 11:51:51 +0200
  • f237cd9bae Update 2005-09-09 evening. Junio C Hamano 2005-09-09 18:46:21 -0700
  • 1f8af483df show-branch: --list and --independent Junio C Hamano 2005-09-09 15:40:45 -0700
  • a9ab586a5d Retire support for old environment variables. Junio C Hamano 2005-09-09 14:48:54 -0700
  • 44ec46a9df Adjust .gitignore for big rename. Junio C Hamano 2005-09-09 11:55:56 -0700
  • 03d98d395a [PATCH] remove duplicate git-send-email-script.perl target in Makefile Marco Roeland 2005-09-09 20:08:50 +0200
  • 96768e3108 [PATCH] fix tutorial typo jdl@freescale.com 2005-09-09 10:41:15 -0500
  • c87d41ebf7 [PATCH] Fix tutorial reference to git-*-scripts. jdl@freescale.com 2005-09-09 09:11:35 -0500
  • 922fb98e1c Ignore datestamp-only changes when installing webdoc. Junio C Hamano 2005-09-09 01:17:54 -0700
  • e8623d45b4 Squelch `removal' message from 'git reset --hard'. Junio C Hamano 2005-09-08 23:14:33 -0700
  • 7bd5db67c1 Updates 2005-09-08 evening. Signed-off-by: Junio C Hamano <junkio@cox.net> Junio C Hamano 2005-09-08 19:12:30 -0700
  • 2d2abeeca3 Updates 2005-09-08 evening. Signed-off-by: Junio C Hamano <junkio@cox.net> Junio C Hamano 2005-09-08 19:09:13 -0700
  • bc6146d2ab 'build' scripts before installing. Junio C Hamano 2005-09-08 18:50:33 -0700
  • 2f0f8b71ee Show all merge-base candidates from show-branch --merge-base Junio C Hamano 2005-09-08 12:15:52 -0700
  • a5043158ea Updates 2005-09-08 early morning. Signed-off-by: Junio C Hamano <junkio@cox.net> Junio C Hamano 2005-09-08 00:14:31 -0700
  • 35ef3a4c63 Documentation updates. Junio C Hamano 2005-09-07 23:04:52 -0700
  • 7c3693f1f2 [PATCH] git-daemon --inetd lars.doelle@on-line.de 2005-09-08 03:50:01 +0200
  • 6a2e50f9df git --version tells which version of git you have. Junio C Hamano 2005-09-07 21:26:52 -0700
  • a3b427b9fa [PATCH] Do not create bogus branch from flag to git branch Amos Waterland 2005-09-07 21:13:26 -0500
  • f0ebff0dfe [PATCH] Portability fix for Solaris 10/x86 Patrick Mauritz 2005-09-06 01:24:03 +0200
  • 215a7ad1ef Big tool rename. Junio C Hamano 2005-09-07 17:26:23 -0700
  • 99977bd5fd GIT 0.99.6 v0.99.6 Junio C Hamano 2005-09-07 15:59:24 -0700
  • 28e50bdb51 Describe tool renames plan. Junio C Hamano 2005-09-07 15:19:41 -0700
  • c8a7baf32d Update 2005-09-07 for post 0.99.6 Junio C Hamano 2005-09-07 14:51:48 -0700
  • 7eb93c8965 [PATCH] Simplify git script David_Kgedal 2005-09-07 09:29:20 +0200
  • 452ce291a9 Documentation updates. Junio C Hamano 2005-09-07 14:28:21 -0700
  • fa6a1427c6 [PATCH] Docs for git-build-rev-cache. A Large Angry SCM 2005-09-07 17:20:41 -0400
  • 8bfcd30990 [PATCH] Docs for git-show-rev-cache. A Large Angry SCM 2005-09-07 17:19:48 -0400
  • f67545eade [PATCH] Docs for git-reset-script. A Large Angry SCM 2005-09-07 17:18:51 -0400
  • 0270f7c500 [PATCH] Docs for git-checkout-script. A Large Angry SCM 2005-09-07 17:17:18 -0400
  • 5077fa9c1e Documentation updates. Junio C Hamano 2005-09-07 14:08:38 -0700
  • 597c9cc540 Flatten tools/ directory to make build procedure simpler. Junio C Hamano 2005-09-07 12:22:56 -0700
  • b893f09104 mailinfo: barf and exist upon nested multipart. Junio C Hamano 2005-09-06 16:46:34 -0700
  • 55d0b8e4f7 v244 Kay Sievers 2005-09-06 23:26:57 +0200
  • 324d7cca68 fix typo in link parameter of git_commit Kay Sievers 2005-09-06 23:26:10 +0200
  • 78938b0d8a Merge branch 'master' of . Junio C Hamano 2005-09-06 13:51:33 -0700