repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin-am: support automatic notes copying
2015-08-05
Paul Tan
builti
n
-am:
supp
o
rt a
u
tomatic notes co
p
ying
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uiltin
-
am: invoke post-rewri
t
e
h
o
o
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin
-
am: i
m
p
l
ement -
S
/--gpg-sign
,
commit
.
gp
g
sig
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
ltin-am: imple
m
ent --committer-date-is-author-date
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-am
:
implemen
t
--ignore
-
date
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
bui
l
ti
n
-
am:
p
as
s
g
it-appl
y
'
s op
t
ions t
o
git-apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builti
n
-am:
i
mpl
e
m
e
nt --[n
o
-
]
sc
i
s
s
or
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-
a
m: suppo
r
t --
k
eep-cr, am
.
keepcr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin
-
am:
implement --[no-]mes
s
age
-
id, am
.
mess
a
g
eid
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin-am: implement -k/--keep, -
-
keep-non-
p
a
tch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-
a
m: imple
m
ent -
u
/--utf8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
builti
n
-am: handle
s
t
ray stat
e
directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
i
l
tin-am:
b
ypas
s
git-ma
i
linf
o
when --reba
s
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
built
i
n-am
:
i
mplement
--rebasing mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
bu
i
ltin
-
am: im
p
lement --3way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
cach
e
-
t
r
ee: intr
o
duce w
r
ite_i
n
de
x
_as_t
r
e
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
bu
i
ltin-a
m
: impleme
n
t -
s
/--sign
o
ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-a
m
: exit with user fr
i
en
d
l
y me
s
s
age o
n
f
a
ilure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin-am: imple
m
ent -q/--quiet
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: reject patches when there's a se
s
sion in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am:
i
mple
m
e
n
t --abort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
i
mplem
e
nt
--ski
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am
:
don't parse mail whe
n
resuming
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am:
i
mplement -
-
resol
v
e
d/--co
n
tinue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: refuse to
apply
patch
e
s
i
f
index is
dirty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
ltin-
a
m: im
p
l
em
e
nt co
m
mit
t
ing a
p
plied p
a
tch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-am:
appl
y
patch
w
i
t
h git-apply
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin
-
am: extract patch an
d
co
m
mit info with git
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uilti
n
-am
:
a
uto-detect mbox
p
atch
e
s
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-a
m
: split out mbox/maildir patches with git
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin-am: imple
m
ent patc
h
queue mechanism
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin
-
am:
i
mplemen
t
s
k
e
l
etal builtin am
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
a
n
wrapper: implement x
f
open
(
)
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
wrapper: implement xopen()
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge b
r
anch 'jk/date-mode-format'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C H
a
mano
M
e
rge branc
h
'
pt/am-tests'
commit
|
commitdiff
|
tree
2015-08-03
J
u
n
i
o
C
Haman
o
Merge b
r
a
nch 'sg
/
ba
s
h
-
prompt
-
untracked-optim'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C Hamano
Merge bra
n
ch
'
c
b
/una
m
e-in-u
n
tr
a
cked
'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C Ham
a
no
M
e
rge bran
c
h 'se/do
c
-checkout-ours
-
theirs'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hamano
Merge branch
'
ib
/
s
cripted-pa
r
se-opt-
b
etter-hint-st
r
ing'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
aman
o
M
er
g
e branch 'mh/fast-im
p
ort-optimize-current-from'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C Hama
n
o
Me
r
ge branch 'kn/tag-doc-fi
x
'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Haman
o
Merge
b
ranch 'mh/fast-import-get-mark
'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o
C
Hamano
Merge branch 'gr/rebas
e
-i-drop-warn'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Ha
m
ano
Merge branch 'jc/commit-slab'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
i
o
C
H
amano
Merg
e
b
r
a
n
c
h
'
dt/log-f
o
llow-config'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge
b
ranch 'gp/status-rebase-i-info'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
M
e
rge branch 'jk/cat-file-batch-all'
commit
|
commitdiff
|
tree
2015-08-03
Junio C H
a
mano
Merge
branch 'js/fsc
k
-o
p
t'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Me
r
ge branch
'
m
h
/init-delete-ref
s
-api'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branc
h
'pt
/
pull-builtin'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C Ha
m
ano
Mer
g
e
branch
'
jk/pk
t
-log-pack'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hama
n
o
M
e
rge branc
h
'mr/
r
ebase-i-customize-insn-s
h
ee
t
'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C Hamano
M
e
rge
branch 'rl/send-ema
i
l-aliases'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge b
r
anch 'k
b
/i
1
8n-doc'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C Hamano
Merge branch 'nd/
e
xport-
w
orktree'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C Hamano
Merg
e
branch 'ee/clean-r
e
move-dirs'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C H
a
m
a
no
Mer
g
e branch 'cb/parse-mag
n
it
u
de
'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C Hamano
M
e
rge branch '
b
c/gpg-verify-raw'
commit
|
commitdiff
|
tree
2015-08-03
Junio C H
a
m
ano
M
e
rge branch
'
pt/am-foreign'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
H
amano
Merge branch 'kn/for-each-ref'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge bran
c
h 'mh/replace-r
e
fs'
commit
|
commitdiff
|
tree
2015-08-03
Karthik Nayak
ref-filt
e
r: make 'ref_array_ite
m
' use a FLEX_ARRAY
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Kart
h
ik Nayak
for
-
each-ref: introduce
f
ilte
r
_
r
ef
s
()
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
K
a
r
thik
Naya
k
ref-filter
:
move
c
ode from 'for-each-
r
e
f'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Ham
a
no
G
it 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
J
u
nio C Hamano
Sync wi
t
h 2
.
4
.
7
commit
|
commitdiff
|
tree
2015-07-27
Junio
C Hamano
Git
2
.
4
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
J
unio C Hama
n
o
Merge branc
h
'jk/pretty-encoding-doc
'
i
n
to maint
commit
|
commitdiff
|
tree
2015-07-27
J
u
nio C Hamano
Merg
e
bra
n
ch 'tb/checkout-doc' into maint
commit
|
commitdiff
|
tree
2015-07-27
J
u
nio C Ha
m
ano
Merge br
a
nch
'
ls/h
i
nt
-
rev-l
i
st
-
count' into
maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge bra
n
ch 'mm/branch-doc
-
updates' in
t
o
ma
i
n
t
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
H
a
mano
Merge branch
'jc/fsck-
r
etire-require-eoh'
i
n
to main
t
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge bran
c
h 'et/http-proxyauth' into ma
i
nt
commit
|
commitdiff
|
tree
2015-07-27
J
unio C H
a
ma
n
o
M
e
rge branch 'jc/unexport-git-p
a
ger-in-use-in-pager
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge branch 'mh
/
strbuf-read-file-returns-ssize-t
'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ha
m
ano
Merge
branch 'kb/confi
g
-unmap-before-re
n
ami
n
g
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio
C Hamano
Merge
branch '
j
k/re
v
-li
s
t-no-bitma
p
-
w
hile-pruning
'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o
C Hamano
Merge branch
'
rh/test-color-avoid-terminfo-in-original
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C
Hama
n
o
Mer
g
e b
r
anch 'j
k
/fix-refr
e
sh-utime'
into maint
commit
|
commitdiff
|
tree
2015-07-27
J
u
nio C Hamano
Mer
g
e branch 'cb/r
e
b
ase-am-e
x
it-code'
into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
H
a
mano
Merge
br
a
nch
'jk
/
index-pack-r
e
duce-recheck' into
maint
commit
|
commitdiff
|
tree
2015-07-24
Ju
n
i
o
C
Haman
o
RelNotes:
a
m
.
thre
e
Way does n
o
t exist (
y
et)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Jun
i
o C Hamano
Revert "git-am:
add am
.
threeWay config variable"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
J
u
nio C Ha
m
a
no
Gi
t
2
.
5
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Junio
C
Ha
m
a
n
o
Merge b
r
anch 't
f
/gitweb-typ
o
f
i
x
'
commit
|
commitdiff
|
tree
2015-07-21
Junio C Ham
a
n
o
M
er
g
e
tag 'l10n-
2
.
5
.
0-rnd2
'
of git://g
i
thub
.
co
m
/git
.
.
.
commit
|
commitdiff
|
tree
2015-07-21
Jeff King
st
r
buf: make strbu
f
_addftime
m
o
re
robust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
S
ZEDER Gáb
o
r
bash promp
t
:
faster untracked status ind
i
cator with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
SZ
E
DER Gábor
ba
s
h pro
m
pt: test u
n
track
e
d f
i
les stat
u
s indica
t
or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Pau
l
T
an
t3901: test git
-
am encoding
c
o
n
v
e
r
s
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3418:
n
on
-
i
n
t
eract
i
ve r
e
b
ase
-
-con
t
inue
with r
e
rere
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul Tan
t4150: t
e
sts
for am --[no-]s
c
isso
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul T
a
n
t4150
:
am with post-applypatch hook
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4
150: am with pre-
a
p
plypatch hook
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
an
t41
5
0: am wit
h
applypatch-msg hook
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul T
a
n
t4150: am
--resol
v
e
d
fails if in
d
ex has unmerged entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150
:
am --
r
esolve
d
fails if
ind
e
x
has no changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150:
a
m refuses patch
e
s when paus
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
an
t4151: am
-
-abort will keep dirty index intact
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next