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