在pull之后,git会列出自上次pull以来修改过的文件。
问题是,在本地repo上进行了更多的工作后如何获得这个列表。
例如:
如何确定
如果我没记错,ORIG_HEAD是上次拉取之前的状态(任何一次拉取,不仅仅是引入一些更改的那次拉取)。
我正在寻找像
我正在尝试设置一个
在基本情况下,像这样的东西可以工作:
但我正在寻找像这样的东西:
问题是,在本地repo上进行了更多的工作后如何获得这个列表。
例如:
$ git checkout feature/default2
$ git pull
Updating 5420c70..b8eec49
Fast-forward
application/configs/application.ini | 1 +
application/modules/product/forms/Search.php | 3 ++
public/themes/default/bootstrap/buttons.less | 25 -----------
public/themes/default/css/cmspanel.css | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------
public/themes/default/css/products.css | 57 ++++++++++++++++++++----
public/themes/default/css/style.css | 270 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------
public/themes/default/gfx/icons/menu-drop-dark.png | Bin 0 -> 160 bytes
public/themes/default/gfx/icons/more.png | Bin 0 -> 120 bytes
public/themes/default/layouts/scripts/footer.phtml | 26 ++++++++++-
public/themes/default/layouts/scripts/gallery.phtml | 2 +
public/themes/default/layouts/scripts/home.phtml | 2 +
public/themes/default/layouts/scripts/layout.phtml | 2 +
public/themes/default/layouts/scripts/products.phtml | 22 ++++-----
public/themes/default/less/cmspanel.less | 26 +++++++++++
public/themes/default/less/nav.less | 4 +-
public/themes/default/less/products.less | 61 +++++++++++++++++++++----
public/themes/default/less/style.less | 59 ++++++++++++++++++++++---
public/themes/default/less/widgets.less | 37 +++++++++++++++-
public/themes/default/modules/cms/scripts/widgets/random.phtml | 6 +--
public/themes/default/modules/default/scripts/widgets/submenu.phtml | 2 +-
public/themes/default/modules/product/scripts/index/view.phtml | 44 +++++++++---------
public/themes/default/modules/product/scripts/widgets/search.phtml | 16 +++++++
22 files changed, 584 insertions(+), 315 deletions(-)
create mode 100644 public/themes/default/gfx/icons/menu-drop-dark.png
create mode 100644 public/themes/default/gfx/icons/more.png
5420c70
是拉取之前的状态。如何确定
5420c70
sha?如果我没记错,ORIG_HEAD是上次拉取之前的状态(任何一次拉取,不仅仅是引入一些更改的那次拉取)。
我正在寻找像
git checkout SOME_HEAD
这样的魔术别名,以便为我执行git checkout 5420c70
。我正在尝试设置一个
git review
别名,它应该比上次拉取时修改过的所有文件进行差异比较,但这些文件不是最新的。在基本情况下,像这样的东西可以工作:
git pull
# lists some chanes file
git diff --name-status ORIG_HEAD..
# diffs them
但我正在寻找像这样的东西:
git pull
# lists some chanes file
git pull
# up-to-date, no changes
git diff --name-status ORIG_HEAD..
# diffs the files since the last pull which was not up-to-date