diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-12-05 12:58:27 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-12-05 12:58:27 -0800 |
commit | 07d406b742b577a39d7cbdacd76d0dde021ff788 (patch) | |
tree | b9c83d886e3b8a5d0169f85b08ac8f52091a4d7b /contrib/credential/gnome-keyring/.gitignore | |
parent | Merge branch 'jk/replace-perl-in-built-scripts' (diff) | |
parent | merge-base: teach "--fork-point" mode (diff) | |
download | tgif-07d406b742b577a39d7cbdacd76d0dde021ff788.tar.xz |
Merge branch 'jc/merge-base-reflog'
Code the logic in "pull --rebase" that figures out a fork point
from reflog entries in C.
* jc/merge-base-reflog:
merge-base: teach "--fork-point" mode
merge-base: use OPT_CMDMODE and clarify the command line parsing
Diffstat (limited to 'contrib/credential/gnome-keyring/.gitignore')
0 files changed, 0 insertions, 0 deletions