summaryrefslogtreecommitdiff
path: root/compat/inet_pton.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-04-30 14:58:00 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-30 14:58:01 -0700
commit1692579dd3569ebc01187872db91ee2ad93cc962 (patch)
treea0f3f06c4a4d4fd9ee038de63ce69d165fc7ac22 /compat/inet_pton.c
parentMerge branch 'jk/maint-config-bogus-section' (diff)
parentgit-rebase: add keep_empty flag (diff)
downloadtgif-1692579dd3569ebc01187872db91ee2ad93cc962.tar.xz
Merge branch 'nh/empty-rebase'
"git rebase" learned to optionally keep commits that do not introduce any change in the original history. By Neil Horman * nh/empty-rebase: git-rebase: add keep_empty flag git-cherry-pick: Add test to validate new options git-cherry-pick: Add keep-redundant-commits option git-cherry-pick: add allow-empty option
Diffstat (limited to 'compat/inet_pton.c')
0 files changed, 0 insertions, 0 deletions