| 2012-05-24 |
checkout: no progress messages if !isatty(2).
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
|
diff | tree |
| 2011-03-01 |
Skip commit objects that should be trees, rather than...
|
diff | tree |
| 2011-03-01 |
It's also okay if an expected tree object is actually...
|
diff | tree |
| 2010-10-21 |
Fix a few typos/grammar-o's in the preceding commit.
|
diff | tree |
| 2010-08-12 |
Fix typo: an -> a
|
diff | tree |
| 2010-06-24 |
Another fix for PATH and msysgit.
|
diff | tree |
| 2010-06-24 |
Merge remote branch 'origin/master'
|
diff | tree |
| 2010-06-24 |
(Hopefully) fix PATH setting for msysgit.
|
diff | tree |
| 2010-02-09 |
Some recent tests accidentally depended on very new...
|
diff | tree |
| 2010-02-09 |
Oops. Apparently I didn't run 'make test' after most...
|
diff | tree |
| 2010-02-08 |
Improve checking for existence of the --prefix directory.
|
diff | tree |
| 2010-02-06 |
Make tests pass with recent git (1.7.0 and up).
|
diff | tree |
| 2010-02-02 |
Jakub's changes broke the progress message slightly.
|
diff | tree |
| 2010-02-02 |
Merge branch 'master' of git://github.com/psionides...
|
diff | tree |
| 2010-01-18 |
Extend merge-subtree tests to test -Xsubtree=dir.
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
|
diff | tree |
| 2010-01-18 |
Teach git-pull to pass -X<option> to git-merge
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
|
diff | tree |
| 2010-01-18 |
git merge -X<option>
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
|
diff | tree |
| 2009-11-30 |
builtin-merge.c: call exclude_cmds() correctly.
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
|
diff | tree |
| 2009-11-21 |
Weird, I forgot to have 'make test' call test.sh.
|
diff | tree |
| 2009-11-15 |
Oops, forgot a COPYING file. It's GPLv2.
|
diff | tree |
| 2009-11-04 |
Add some tips for how to install.
|
diff | tree |
| 2009-10-02 |
cmd_pull didn't support --squash correctly.
|
diff | tree |
| 2009-10-02 |
Fix a minor problem in identifying squashes vs. normal...
|
diff | tree |
| 2009-10-02 |
If someone provides a --prefix that ends with slash...
|
diff | tree |
| 2009-10-02 |
Merge branch 'master' of git://github.com/voxpelli...
|
diff | tree |
| 2009-10-02 |
Add a README that says to email me instead of using...
|
diff | tree |
| 2009-08-26 |
Fix behaviour if you have a branch named the same as...
|
diff | tree |
| 2009-08-26 |
Improve patch to use git --exec-path: add to PATH instead.
|
diff | tree |
| 2009-08-02 |
todo: idea for a 'git subtree grafts' command
|
diff | tree |
| 2009-08-01 |
todo
|
diff | tree |
| 2009-07-16 |
todo^
|
diff | tree |
| 2009-07-10 |
todo
|
diff | tree |
| 2009-07-09 |
Docs: when pushing to github, the repo path needs to...
|
diff | tree |
| 2009-07-07 |
todo
|
diff | tree |
| 2009-07-02 |
Some todo items reported by pmccurdy
|
diff | tree |
| 2009-06-15 |
update todo
|
diff | tree |
| 2009-05-30 |
man page: add an EXAMPLES section.
|
diff | tree |
| 2009-05-30 |
Add basic git-subtree manpage in asciidoc format.
|
diff | tree |
| 2009-05-30 |
Make --squash work with the 'add' command too.
|
diff | tree |
| 2009-05-30 |
Fix splitting after using a squash merge.
|
diff | tree |
| 2009-05-30 |
Don't squash-merge if the old and new commits are the...
|
diff | tree |
| 2009-05-30 |
Basic "subtree merge --squash" support.
|
diff | tree |
| 2009-05-30 |
merge_msg() is really more like rejoin_msg().
|
diff | tree |
| 2009-05-30 |
FIXME help for --squash option
|
diff | tree |
| 2009-05-30 |
slightly rearrange help message for split.
|
diff | tree |
| 2009-05-30 |
New --branch option to split command.
|
diff | tree |
| 2009-05-30 |
typo in comment
|
diff | tree |
| 2009-05-24 |
More to-do items based on feedback
|
diff | tree |
| 2009-05-01 |
Abort if --rejoin fails.
|
diff | tree |
| 2009-04-26 |
debug messages are off by default; use -d to enable.
|
diff | tree |
| 2009-04-26 |
test.sh: oops, never intended to count the raw number...
|
diff | tree |
| 2009-04-26 |
Simplify merges even more aggressively.
|
diff | tree |
| 2009-04-26 |
test.sh: make sure no commit changes more than one...
|
diff | tree |
| 2009-04-26 |
Only copy a commit if it has at least one nonidentical...
|
diff | tree |
| 2009-04-26 |
Trim some extra merge commits that don't need to go...
|
diff | tree |
| 2009-04-26 |
test.sh tweak
|
diff | tree |
| 2009-04-26 |
Add some basic assertions to test.sh.
|
diff | tree |
| 2009-04-26 |
Add a 'create' helper function in test.sh.
|
diff | tree |
| 2009-04-26 |
Clarify why we can't do 'git rev-list' with a path.
|
diff | tree |
| 2009-04-26 |
Typo when searching for existing splits.
|
diff | tree |
| 2009-04-26 |
Add --annotate option, and create recognizable file...
|
diff | tree |
| 2009-04-26 |
todo list
|
diff | tree |
| 2009-04-25 |
Change test.sh to test the new add, merge, and pull...
|
diff | tree |
| 2009-04-25 |
Handle it successfully if a given parent commit has...
|
diff | tree |
| 2009-04-25 |
Add 'git subtree merge' and 'git subtree pull'.
|
diff | tree |
| 2009-04-25 |
Add a new 'git subtree add' command for adding subtrees...
|
diff | tree |
| 2009-04-25 |
Pass the path using the --prefix option instead of...
|
diff | tree |
| 2009-04-25 |
Okay, that was a little too aggressive.
|
diff | tree |
| 2009-04-25 |
Even more aggressive commit trimming.
|
diff | tree |
| 2009-04-25 |
Prune out some extra merge commits by comparing their...
|
diff | tree |
| 2009-04-25 |
Quick test script for generating reasonably complex...
|
diff | tree |
| 2009-04-24 |
Skip over empty commits.
|
diff | tree |
| 2009-04-24 |
Hmm... can't actually filter rev-list on the subdir...
|
diff | tree |
| 2009-04-24 |
Added a --onto option, but it's so complicated I can...
|
diff | tree |
| 2009-04-24 |
Use information about prior splits to make sure merges...
|
diff | tree |
| 2009-04-24 |
Add a new --rejoin option.
|
diff | tree |
| 2009-04-24 |
Print out the newly created commitid at the end, for...
|
diff | tree |
| 2009-04-24 |
We now copy the other stuff about a commit (changelog...
|
diff | tree |
| 2009-04-24 |
'git subtree split' now basically works.
|
diff | tree |
| 2009-04-24 |
basic options parsing and whatnot.
|
diff | tree |
| 2008-08-04 |
git-svn: Abort with an error if 'fetch' parameter is...
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
|
diff | tree |
| 2008-08-02 |
Teach "git diff -p" Pascal/Delphi funcname pattern
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
|
diff | tree |
| 2008-07-17 |
Reword "your branch has diverged..." lines to reduce...
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
|
diff | tree |
| 2008-06-29 |
git-svn: avoid filling up the disk with temp files.
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
|
diff | tree |
| 2008-06-14 |
git-svn: test that extra blank lines aren't inserted...
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
|
diff | tree |
| 2008-06-14 |
git-svn: don't append extra newlines at the end of...
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
|
diff | tree |
| 2008-05-05 |
git-svn: add documentation for --add-author-from option.
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
|
diff | tree |
| 2008-05-05 |
git-svn: Add --add-author-from option.
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
|
diff | tree |
| 2008-05-05 |
git-svn: add documentation for --use-log-author option.
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
|
diff | tree |