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 --keep-cr, am.keepcr
2015-08-05
Pau
l
Tan
b
u
i
l
t
i
n
-am: suppor
t
--
k
eep-c
r
,
am
.
keepcr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-
a
m: i
m
plement
--[no-]mes
s
age-id, am
.
messageid
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
a
n
bu
i
lt
i
n-am: i
m
plem
e
nt -k
/
--k
e
ep,
-
-keep-non-patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uiltin
-
a
m
: imp
l
em
e
nt -u/--utf8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
built
i
n-am:
h
andle stray state
direct
o
ry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
T
a
n
buil
t
in-
a
m: bypass
git-ma
i
linfo when --re
b
as
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement --reb
a
sing mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implem
e
nt --3way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
cache
-
tree: introduce
write
_
index_as_tree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
built
i
n-a
m
: imp
l
e
ment -
s
/
-
-signo
f
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
il
t
i
n-am: exit
with user frie
n
dly
m
essage
o
n fai
l
ure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: imp
l
ement -q/--qui
e
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: reje
c
t
patches when
t
here's
a
session in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am: implement --abort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uiltin-am:
implement --skip
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: don't parse mail wh
e
n resumin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
builtin-am: implement --resolved/--continue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
r
efuse t
o
apply patches if
i
ndex is
dirty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am: implement commi
t
ting app
l
ied patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: app
l
y patch with git-ap
p
ly
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
uiltin-am
:
ext
r
act
p
atch
a
nd commit 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
buil
t
in-a
m
: a
u
to-detect mbox patches
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-am
:
split out
mbox/m
a
ildir 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
built
i
n-am
:
i
mplement patch 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
Paul Tan
builtin-
a
m: implement
s
keletal
b
uilt
i
n 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
an
wra
p
per: imp
l
ement
xf
o
pen()
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 xop
e
n()
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Ha
m
ano
Mer
g
e
b
ranc
h
'jk/date-
m
ode
-
forma
t
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch 'pt/am
-
tests'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Me
r
g
e
branc
h
'sg
/
bash-prom
p
t-untra
c
ked-o
p
tim
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hama
n
o
Merge branch 'cb/uname-in-untracked'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
M
e
rge br
a
n
ch
'
se/doc-checkout-ou
r
s
-th
e
irs'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hama
n
o
Merge br
a
n
ch 'ib/scr
i
pted-p
a
r
s
e-
o
pt-better-hint-
s
tri
n
g
'
commit
|
commitdiff
|
tree
2015-08-03
J
unio
C
Ha
m
ano
Mer
g
e bran
c
h 'm
h
/fast-import-op
t
imiz
e
-cur
r
e
nt-from'
commit
|
commitdiff
|
tree
2015-08-03
J
u
n
i
o C
Ha
m
ano
Me
r
ge
b
ranch
'
kn/ta
g
-doc-fix
'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C Hamano
Me
r
ge bra
n
ch 'mh/fast-import-get-mark'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio
C
H
a
mano
Merge b
r
anch
'gr/rebase-i-drop-
w
arn'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hamano
Merge branch '
j
c
/
commit-slab'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C Hamano
Merge
branch 'dt/l
o
g-follow-config'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch 'gp/status-reba
s
e-i
-
info'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Me
r
ge br
a
nch
'jk/
c
at
-
file-batch-all'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Me
r
ge
b
r
an
c
h 'js/fsck-opt'
commit
|
commitdiff
|
tree
2015-08-03
J
u
n
io C
H
amano
Merge branch 'm
h
/in
i
t-
d
ele
t
e-refs-api'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Ha
m
ano
Merge
b
r
anch '
p
t/pull-built
i
n'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C Hamano
Me
r
ge branch 'jk/
p
kt-log-pack
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ha
m
a
no
Mer
g
e b
r
anc
h
'mr
/
rebas
e
-i-custo
m
ize-
i
nsn-sheet'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
Haman
o
Merge branch 'r
l
/sen
d
-e
m
a
i
l
-alias
e
s'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branc
h
'kb/i18
n
-doc
'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C
Ha
m
a
n
o
Merge b
r
anc
h
'nd/export-worktree'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o
C
Hama
n
o
Merge branch 'ee
/
clean-remove-dirs'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io
C
Hamano
Me
r
g
e bran
c
h 'cb
/
parse-magnitude
'
commit
|
commitdiff
|
tree
2015-08-03
J
u
n
io
C
Hamano
Merge branch
'bc
/
gpg-verify-
r
aw'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C Hamano
Merge b
r
an
c
h
'pt
/
am-f
o
reign'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hama
n
o
M
e
r
g
e
br
a
nch
'kn
/
f
or-each-ref'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C Hamano
Merge branch
'
mh
/
replac
e
-r
e
fs'
commit
|
commitdiff
|
tree
2015-08-03
Karthik Nayak
ref-filter
:
make 'ref
_
array_i
t
em' u
s
e a FLEX_ARRAY
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
K
a
r
t
hik Nayak
f
o
r-each-ref: intro
d
uce filter_refs()
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Karthik Nay
a
k
ref-filter: move code fro
m
'for-eac
h
-ref
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hama
n
o
Git
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Sync wi
t
h 2
.
4
.
7
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C
H
amano
Git
2
.
4
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Mer
g
e branch 'jk/pre
t
ty
-
encoding-doc' into maint
commit
|
commitdiff
|
tree
2015-07-27
J
unio C Hamano
Merge branch 'tb/chec
k
ou
t
-doc' in
t
o maint
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C
H
a
m
ano
Merge bran
c
h 'l
s
/hi
n
t-rev-list-count' into m
a
int
commit
|
commitdiff
|
tree
2015-07-27
Junio C
Hamano
Merge bran
c
h '
m
m/branch-doc-updates' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Hamano
Merge branch 'jc/fsck
-
retire-require-
e
oh' into maint
commit
|
commitdiff
|
tree
2015-07-27
J
u
n
i
o C Haman
o
Me
r
ge branch 'e
t
/htt
p
-proxya
u
th'
i
n
t
o
main
t
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C Hamano
Merge branch 'jc/unex
p
ort
-
git-pag
e
r-in-use
-
i
n
-
p
a
ge
r
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge branch 'mh/strbuf-read-file-returns
-
ssize-t'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
io C H
a
mano
Merge
b
ranch 'kb/config-unmap-b
e
fore-renaming' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Haman
o
Mer
g
e bran
c
h 'jk/
r
ev-lis
t
-
n
o
-bitma
p
-
while-pruning'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C
H
a
m
a
n
o
Merge branch 'rh
/
te
s
t-color-avo
i
d-terminfo-i
n
-
o
rigin
a
l
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
J
u
n
io C Hamano
Merge branch 'jk/fix-refresh-utime'
i
nto maint
commit
|
commitdiff
|
tree
2015-07-27
Junio
C Hamano
Mer
g
e
branc
h
'cb/rebase-am-exi
t
-code' into maint
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C Hamano
Merge branch 'jk/index-pack-reduce
-
re
c
h
ec
k
' into maint
commit
|
commitdiff
|
tree
2015-07-24
Junio C H
a
mano
R
e
lNotes: am
.
threeWay does
n
o
t
exist
(
yet)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
J
u
ni
o
C
Hamano
Re
v
ert
"
g
it-am:
a
dd a
m
.
th
r
eeWay con
f
ig variable"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Junio C Ha
m
ano
Git 2
.
5
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Junio
C Hamano
Merge branch 'tf/gitweb-typofix'
commit
|
commitdiff
|
tree
2015-07-21
Junio
C Hamano
M
e
rge ta
g
'l1
0
n-2
.
5
.
0-r
n
d2'
of git://gith
u
b
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2015-07-21
Jeff K
i
ng
strbuf: make strbuf_addftim
e
more robust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
SZED
E
R G
á
bor
bash
p
rompt: faster untracked status in
d
icat
o
r with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
SZEDER G
á
bor
bash pr
o
m
pt: te
s
t untracked
f
iles status indi
c
ator
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
39
0
1: test
git-am
e
ncoding
c
on
v
e
r
sion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3418
:
non-inte
r
acti
v
e
rebas
e
--continue
w
ith rerere
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul T
a
n
t4150:
tests for am --[no-]scissors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
an
t
4
1
50: am
w
i
th post-ap
p
lyp
a
tch 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
15
0
:
am wit
h
pre-
a
pplypatch hook
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul
T
an
t4150:
a
m w
i
th
a
pplypatch-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 Tan
t4150: am --reso
l
ved
fails if index
h
as
unmerged entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
a
n
t4150
:
am -
-
resolved fails if index has no
changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Ta
n
t
4
150: am refuses patches when
p
aused
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4151:
a
m --abort will keep dirty in
d
ex int
a
ct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am f
a
ils if in
d
e
x
i
s dirty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-17
Charles Bailey
untr
a
cked: fix det
e
ction of u
n
ame(
2
) failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-17
Junio C Hamano
Merg
e
bran
c
h
'
jk/still-in
t
eresting'
commit
|
commitdiff
|
tree
2015-07-17
Jun
i
o C Hamano
Merge branch 'es
/
w
orktree-add'
commit
|
commitdiff
|
tree
2015-07-17
Eric Sunshi
n
e
Docum
e
n
t
ation/git: fix stale "MULTIPLE
C
HECKOUT MO
D
E
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
Junio C
H
a
m
a
no
w
or
k
tre
e
: caution that this is sti
l
l experimental
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
E
r
ic Sunshine
Documentation/git-worktree:
f
i
x stale "git check
o
ut
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next