Commit Graph

  • b74fce16fa allow OFS_DELTA objects during a push Nicolas Pitre 2009-05-01 16:56:47 -0400
  • 1087aba86b ctype.c: fix typo in comment René Scharfe 2009-05-01 22:03:07 +0200
  • 4b25d091ba Fix a bunch of pointer declarations (codestyle) Felipe Contreras 2009-05-01 12:06:36 +0300
  • a91be3fcbe git-gui: Fixes for Mac OS X TkAqua Daniel A. Steffen 2008-08-16 03:20:09 +0200
  • 75b44066f3 Merge git://git.kernel.org/pub/scm/gitk/gitk Junio C Hamano 2009-04-30 19:56:28 -0700
  • ea28d67442 Abort if --rejoin fails. Avery Pennarun 2009-04-30 21:57:32 -0400
  • d93f1713b0 gitk: Use themed tk widgets Pat Thoyts 2009-04-17 01:24:35 +0100
  • fced800806 Merge branch 'master' into dev Paul Mackerras 2009-05-01 09:34:57 +1000
  • ad7ef5b88d gitk: Add Russian translation Alex Riesen 2009-04-27 20:04:27 +0200
  • 652d1800b0 Meta/Make: do not special case decl-after-statement warning Junio C Hamano 2009-04-29 22:11:46 -0700
  • 7128f0a0db Dothem: pass --loose as well Junio C Hamano 2009-04-29 22:11:24 -0700
  • f4eb1b7f4f What's in/cooking updates Junio C Hamano 2009-04-29 22:10:24 -0700
  • adfd55d51b Clarify kind of conflict in merge-one-file helper Alex Riesen 2009-04-29 23:40:50 +0200
  • 6ffd567bec improve error message in config.c Alex Riesen 2009-04-29 23:27:54 +0200
  • f6a5f1bb50 print unlink(2) errno in copy_or_link_directory Alex Riesen 2009-04-29 23:24:52 +0200
  • 691f1a28bf replace direct calls to unlink(2) with unlink_or_warn Alex Riesen 2009-04-29 23:22:56 +0200
  • fc71db39e0 Introduce an unlink(2) wrapper which gives warning if unlink failed Alex Riesen 2009-04-29 23:21:46 +0200
  • d1c8c0c8c4 Merge branch 'maint' Junio C Hamano 2009-04-29 16:50:31 -0700
  • 3e8a00ae1d daemon.c: fix segfault on OS X Benjamin Kramer 2009-04-27 15:59:49 +0200
  • 0c44c94309 merge-recursive: do not die on a conflicting submodule Junio C Hamano 2009-04-29 11:08:18 -0700
  • d212ca1724 git config: error when editing a repo config and not being in one Felipe Contreras 2009-04-30 01:49:47 +0300
  • 2163e3f778 parseopt: fix documentation for --keep-dashdash Uwe Kleine-König 2009-04-28 22:29:24 +0200
  • 348df16679 Rename core.unreliableHardlinks to core.createObject Johannes Schindelin 2009-04-28 00:32:25 +0200
  • a2dc04ba15 Merge branch 'maint-1.6.1' into maint Junio C Hamano 2009-04-29 15:40:33 -0700
  • 934747323c Merge branch 'maint-1.6.0' into maint-1.6.1 Junio C Hamano 2009-04-29 13:43:13 -0700
  • 7dae8b21c2 diff -c -p: do not die on submodules Junio C Hamano 2009-04-29 12:49:52 -0700
  • c736b4c83b git-gui: Update Russian translation Alex Riesen 2009-04-29 07:56:06 +0200
  • 26e47f2540 doc: consistently use ASCIIDOC_EXTRA Eric Blake 2009-04-28 06:28:32 -0600
  • d4b1902715 Makefile: installing git in cygwin 1.7.0 Eric Blake 2009-04-28 06:28:31 -0600
  • b79376cdf3 Merge branch 'maint' Junio C Hamano 2009-04-28 00:46:39 -0700
  • 2254da06a5 Merge branch 'maint-1.6.1' into maint Junio C Hamano 2009-04-28 00:46:25 -0700
  • 3e73cb2f48 Merge branch 'maint-1.6.0' into maint-1.6.1 Junio C Hamano 2009-04-28 00:46:20 -0700
  • 47afed5dc1 SubmittingPatches: itemize and reflect upon well written changes Sam Vilain 2009-04-28 02:38:47 +1200
  • 62f780dcc6 Makefile: fix NO_PERL bug with gitweb Jeff King 2009-04-27 23:34:24 -0400
  • 7c8224b6a8 t3702: fix reliance on SHELL_PATH being '/bin/sh' Johannes Schindelin 2009-04-27 19:51:42 +0200
  • c922b01f54 grep: fix segfault when "git grep '('" is given Linus Torvalds 2009-04-27 11:10:24 -0700
  • b9d622e711 t5701: do not get stuck in empty-push/ Johannes Schindelin 2009-04-28 00:12:31 +0200
  • 9a695fbf38 NetBSD compilation fix Patrick Welche 2009-04-26 14:49:00 +0100
  • d649048e68 Documentation: fix a grammatical error in api-builtin.txt Allan Caffee 2009-04-13 14:11:21 -0400
  • 345f6e2cb5 builtin-merge: fix a typo in an error message Allan Caffee 2009-04-13 14:10:08 -0400
  • fe4a9c36a3 Add semicolon to curly brace group in main Makefile Mark Drago 2009-04-26 22:36:48 -0400
  • 531e6daa03 prune-packed: advanced progress even for non-existing fan-out directories Johannes Sixt 2009-04-27 09:44:58 +0200
  • f148646b77 Meta/DoKernelOrg: adjust to multi-arch $HOME structure better Junio C Hamano 2009-04-26 19:53:04 -0700
  • 8339e55e1d Meta/Dothem: support multi-arch $HOME directory better Junio C Hamano 2009-04-26 19:49:29 -0700
  • c6eb876ec5 Meta/V: translate dirty->with changes consistently Junio C Hamano 2009-04-26 19:48:39 -0700
  • 95110d75d9 t4202: fix typo v1.6.3-rc3 Linus Torvalds 2009-04-26 12:29:13 -0700
  • 942dce5578 debug messages are off by default; use -d to enable. Avery Pennarun 2009-04-26 18:06:08 -0400
  • 34a82bda77 test.sh: oops, never intended to count the raw number of commits. Avery Pennarun 2009-04-26 18:05:49 -0400
  • 795e730e71 Simplify merges even more aggressively. Avery Pennarun 2009-04-26 17:44:18 -0400
  • fa16ab36ad test.sh: make sure no commit changes more than one file at a time. Avery Pennarun 2009-04-26 17:43:53 -0400
  • 49cf82288a Only copy a commit if it has at least one nonidentical parent. Avery Pennarun 2009-04-26 17:07:16 -0400
  • a64f3a7286 Trim some extra merge commits that don't need to go into the split tree. Avery Pennarun 2009-04-26 16:53:57 -0400
  • a046c7b124 test.sh tweak Avery Pennarun 2009-04-26 16:33:38 -0400
  • 1490e1546a Add some basic assertions to test.sh. Avery Pennarun 2009-04-26 16:28:56 -0400
  • 0ad3dd8534 Add a 'create' helper function in test.sh. Avery Pennarun 2009-04-26 15:55:56 -0400
  • 1f73862f3b Clarify why we can't do 'git rev-list' with a path. Avery Pennarun 2009-04-26 15:54:42 -0400
  • 86de04c6eb Typo when searching for existing splits. Avery Pennarun 2009-04-26 09:55:59 -0400
  • d0eb1b1417 Add --annotate option, and create recognizable file content during tests. Avery Pennarun 2009-04-26 08:59:12 -0400
  • 8c384754d8 todo list Avery Pennarun 2009-04-26 08:53:14 -0400
  • a408e0e649 diff: do not color --stat output like patch context Markus Heidelberg 2009-04-25 00:06:47 +0200
  • 4037b51ef4 Meta/V: deal with the initial bootstrapping case a bit better Junio C Hamano 2009-04-25 23:39:24 -0700
  • 936a95a091 Allow multi-arch installation Junio C Hamano 2009-04-25 22:05:45 -0700
  • be66a6c43d Add an option not to use link(src, dest) && unlink(src) when that is unreliable Johannes Schindelin 2009-04-25 11:57:14 +0200
  • 785a985749 connect: replace inet_ntop with getnameinfo Benjamin Kramer 2009-04-24 14:16:41 +0200
  • 911198f6c0 Documentation: git-clean: make description more readable Wesley J. Landaker 2009-04-25 09:13:41 -0600
  • 926337fe89 Documentation: git-clean: fix minor grammatical errors Wesley J. Landaker 2009-04-25 09:13:40 -0600
  • c5fe5b6de9 Remove obsolete bug warning in man git-update-server-info Sitaram Chamarty 2009-04-25 16:26:52 +0530
  • 1ef2d5a640 t7700-repack: repack -a now works properly, expect success from test Brandon Casey 2009-04-24 18:18:53 -0500
  • 84eeb687de t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-' Brandon Casey 2009-04-24 18:18:52 -0500
  • 66913284f0 progress bar: round to the nearest instead of truncating down Nicolas Pitre 2009-04-24 17:46:15 -0400
  • 6123d7196f bash completion: show-branch color support Markus Heidelberg 2009-04-25 13:46:14 +0200
  • f29ac4f1b0 GIT 1.6.3-rc2 v1.6.3-rc2 Junio C Hamano 2009-04-24 22:54:40 -0700
  • 86e081aea4 Merge branch 'maint' Junio C Hamano 2009-04-24 22:59:08 -0700
  • f06b9f1dff Merge branch 'maint-1.6.1' into maint Junio C Hamano 2009-04-24 22:58:31 -0700
  • cc13719451 Merge branch 'maint-1.6.0' into maint-1.6.1 Junio C Hamano 2009-04-24 22:49:34 -0700
  • a13a299996 Change test.sh to test the new add, merge, and pull commands. Avery Pennarun 2009-04-25 00:07:04 -0400
  • b9de53532c Handle it successfully if a given parent commit has no parents. Avery Pennarun 2009-04-25 00:06:45 -0400
  • 13648af5ee Add 'git subtree merge' and 'git subtree pull'. Avery Pennarun 2009-04-24 23:41:19 -0400
  • eb7b590c8c Add a new 'git subtree add' command for adding subtrees from a given rev. Avery Pennarun 2009-04-24 23:28:30 -0400
  • 9a8821ff33 Pass the path using the --prefix option instead of on the command line. Avery Pennarun 2009-04-24 22:57:14 -0400
  • 96db2c0448 Okay, that was a little too aggressive. Avery Pennarun 2009-04-24 22:36:06 -0400
  • d691265880 Even more aggressive commit trimming. Avery Pennarun 2009-04-24 22:05:30 -0400
  • 210d083904 Prune out some extra merge commits by comparing their parents correctly. Avery Pennarun 2009-04-24 21:49:19 -0400
  • 847e868167 Quick test script for generating reasonably complex merge scenarios. Avery Pennarun 2009-04-24 21:35:50 -0400
  • 768d6d1005 Skip over empty commits. Avery Pennarun 2009-04-24 17:53:10 -0400
  • 2c71b7c46d Hmm... can't actually filter rev-list on the subdir name. Avery Pennarun 2009-04-24 17:42:33 -0400
  • 33ff583ad7 Added a --onto option, but it's so complicated I can't tell if it works. Avery Pennarun 2009-04-24 17:05:14 -0400
  • 8b4a77f2a1 Use information about prior splits to make sure merges work right. Avery Pennarun 2009-04-24 16:48:08 -0400
  • b77172f814 Add a new --rejoin option. Avery Pennarun 2009-04-24 15:48:41 -0400
  • e25a6bf837 Print out the newly created commitid at the end, for use in other scripts. Avery Pennarun 2009-04-24 14:52:27 -0400
  • fd9500eef2 We now copy the other stuff about a commit (changelog, author, etc). Avery Pennarun 2009-04-24 14:45:02 -0400
  • 2573354e9b 'git subtree split' now basically works. Avery Pennarun 2009-04-24 14:24:38 -0400
  • 0ca71b3737 basic options parsing and whatnot. Avery Pennarun 2009-04-24 14:13:34 -0400
  • a766829458 t7800: respect NO_PERL Jeff King 2009-04-24 09:56:14 -0400
  • cd294bc3f3 remote.c: do not trigger remote.<name>.<var> codepath for two-level names Johannes Sixt 2009-04-23 15:49:05 +0200
  • 178b513eb7 builtin-help: silently tolerate unknown keys Johannes Sixt 2009-04-23 15:49:06 +0200
  • 677fbff88f Explain seemingly pointless use of system in difftool Alex Riesen 2009-04-23 21:18:09 +0200
  • ca2cedba70 git-submodule: add support for --rebase. Peter Hutterer 2009-04-24 09:06:38 +1000
  • 5be3b17f09 Makefile: ignore perl/ subdirectory under NO_PERL Junio C Hamano 2009-04-22 22:42:28 -0700
  • 66e35fcb79 config.txt: Make configuration paragraph more consistent Stephen Boyd 2009-04-23 02:38:02 -0700