git命令的顺序是什么
git diff [--options] <commit> <commit> [--] [<path>…]
将不同的提交相互比较？似乎我想将新的与我需要做的旧的进行比较
git diff [--options] <New_commit> <Old_commit> 为了看到当前的差异？
我经常这样做 git diff [--options] <Old_commit> <New_commit>
但那似乎是错的？
当我做的时候
$ git diff `git rev-list --since="jun 30 2014" --reverse origin/master | head -1` `git rev-list --until="dec 31 2014" origin/master | head -1` --shortstat
1072 files changed, 389650 insertions(+), 39180 deletions(-)
但是,当我这样做
$ git diff --stat `git rev-list --until="dec 31 2014" origin/master | head -1`
我得到的打印输出:
384 files changed, 61255 insertions(+), 20526 deletions(-)
哪个不是300000附近.所以我的问题是我是否应该首先插入新提交和旧提交sedond,如:
$ git diff `git …我有以下方法
private ArrayList<User> allUsers = new ArrayList<User>();
public User getUser(int index) {
try {
return allUsers.get(index);
}
catch(IndexOutOfBoundsException e) {
// What should I return here?? Say that you want index 0 and no User
// exists in the ArrayList allUsers, what should I then return? The
// method needs a User to be returned
}
}
而且我不确定该怎么做,我确信这是一个简单的解决方法,但我应该在catch块中返回什么？Eclipse抱怨User必须返回.
我有两个片段，并将它们设置如下
fram1 = new FragMent1();
fragMentTra.addToBackStack(null);
fragMentTra = getFragmentManager().beginTransaction().add(rl.getId(), fram1, "fram1");
fram2 = new FragMent2();
fragMentTra.addToBackStack(null);
fragMentTra = getFragmentManager().beginTransaction().add(rl.getId(), fram2, "fram2");
片段扩展Listfragment，而不是其他。
public class FragMent1 extends android.support.v4.app.ListFragment {
public class FragMent2 extends Fragment{
当我执行生产线时 fragMentTra = getFragmentManager().beginTransaction().add(rl.getId(), fram1, "fram1");
我收到以下错误消息。有人知道如何解决吗？
The method add(int, Fragment, String) in the type FragmentTransaction is not applicable for the arguments (int, FragMent1, String)