repo.or.cz
/
git
/
mingw
/
j6t.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
Paul Tan
builtin-a
m
: su
p
port --kee
p
-cr, am
.
keep
c
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement
-
-
[n
o
-]
m
essage
-
id
,
am
.
m
e
ssa
g
eid
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
builtin-am: im
p
lement -k
/
--keep
,
-
-
keep-
n
on-patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-
a
m: im
p
lement -
u
/--ut
f
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
ltin-am: handle
stray
state dir
e
ctory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-a
m
: by
p
a
s
s
gi
t
-mail
i
nfo wh
e
n --rebas
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul T
a
n
builtin-am: im
p
lement --rebasing mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builti
n
-am: implement --3way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
cache-tree: i
n
t
r
oduce wr
i
te_in
d
ex_as_tree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
built
i
n-am:
i
mp
l
ement -s/--s
i
gnoff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
b
uiltin-am: exit with user fri
e
ndly message on failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l
Tan
b
u
iltin-am: im
p
lement
-q/--quiet
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-am: reject patches whe
n
there's a session in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
b
u
il
t
in-am: imple
m
ent --
a
bort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
ilti
n
-am: implement -
-
skip
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
buil
t
in-a
m
:
d
on't p
a
rse mail w
h
e
n resuming
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
ltin-am:
implem
e
nt --
r
eso
l
ved/--continu
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Ta
n
built
i
n-am: r
e
fuse to apply patches if
i
n
dex
i
s dirt
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
au
l
Tan
builti
n
-am: implement commit
t
ing applied patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uiltin-am:
a
p
ply
p
a
t
ch with
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 Tan
buil
t
in-am: extract
p
atch
a
n
d commit
i
n
fo 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 T
a
n
builtin-am
:
auto-d
e
tect mb
o
x
patches
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
bui
l
tin
-
a
m
: split out mbox/mai
l
dir 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
Pau
l
Tan
b
u
iltin-am
:
implement patch queue mechan
i
sm
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l Tan
bu
i
ltin
-
am: implement skel
e
tal 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
Pau
l
Ta
n
wrapper:
implemen
t
xfop
e
n()
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
w
r
apper:
implement x
o
pen()
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
J
u
ni
o
C
H
a
man
o
Merg
e
b
ran
c
h 'jk/date-mode-format'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
am
a
no
Merge branch 'pt/am-tests
'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C Hamano
Merge br
a
nch 'sg
/
ba
s
h-p
r
o
mpt-u
n
trac
k
ed-op
t
i
m
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C H
a
mano
Merge
branch 'cb/uname
-
in
-
untra
c
ked
'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Hama
n
o
Merge
b
ranch 'se/doc-checkout-o
u
rs-theirs'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Me
r
ge
branch 'ib/scripted-pa
r
se-opt-better-
h
in
t
-
s
tri
n
g'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch 'mh/fas
t
-impo
r
t-opt
i
mize
-
c
u
r
rent-from'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C Ham
a
no
Merg
e
branch 'kn/
t
ag-doc
-
fix'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch 'mh/f
a
st-i
m
p
ort-get-mark'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C
H
amano
Merge branch 'gr/r
e
ba
s
e
-
i-drop
-
warn'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C
Hamano
Merg
e
branch
'
j
c
/
commit-slab
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Mer
g
e branc
h
'dt
/
log-fol
l
o
w
-c
o
nfig'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
H
a
m
ano
M
e
rge bra
n
c
h
'g
p
/
s
ta
t
us-rebase
-
i-info'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
amano
Merge br
a
nch 'jk/cat-fi
l
e-
b
atch-all'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Mer
g
e
b
r
a
n
ch 'j
s
/fsc
k
-opt'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io
C
Hamano
M
e
rge branch
'mh/init-
d
elete
-
refs-api'
commit
|
commitdiff
|
tree
2015-08-03
J
u
n
io
C
Hamano
Merge b
r
anch 'pt/pull-builtin'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C H
a
m
a
no
Merge branch 'jk
/
pkt
-
log
-
pack'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ham
a
no
Merge b
r
anch
'mr/rebase-i-customize-insn-she
e
t'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ham
a
n
o
Merge
b
r
anch 'rl/sen
d
-email-aliases'
commit
|
commitdiff
|
tree
2015-08-03
Junio C H
a
mano
Merge branch 'kb/i18n-
d
oc'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o
C
Hamano
Merge br
a
nch
'nd/ex
p
o
rt-w
o
rktree'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hamano
Mer
g
e branch 'ee/
c
lean-re
m
ov
e
-dir
s
'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C Hamano
Merg
e
br
a
nch 'cb/parse-mag
n
itud
e
'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C Ha
m
a
n
o
Merge bra
n
ch 'bc/gp
g
-verify-
r
aw'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hama
n
o
Merge branch 'pt/am-foreign'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hama
n
o
Merge
branch 'kn/for-each-ref'
commit
|
commitdiff
|
tree
2015-08-03
Junio C H
a
mano
Mer
g
e
branch 'mh/r
e
place-refs'
commit
|
commitdiff
|
tree
2015-08-03
K
ar
t
hik Nayak
r
e
f-filter: make
'
ref_
a
rray_item' us
e
a
F
LEX_ARRA
Y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Ka
r
thik Nayak
for
-
each
-
ref: intro
d
u
c
e f
i
lter_refs()
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Karthi
k
Nay
a
k
ref-f
i
lter: move co
d
e from 'for-each-ref
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C Hamano
Gi
t
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Sync with
2
.
4
.
7
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C
H
aman
o
Git
2
.
4
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
J
u
nio C Haman
o
Merge
b
r
anch 'jk/p
r
etty-encod
i
ng-
d
o
c' int
o
maint
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
io C
Hamano
Merg
e
branch 'tb/checkout-doc' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Mer
g
e br
a
n
c
h 'l
s
/hin
t
-
rev-list-count' into maint
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
io C Ham
a
no
M
erge
b
ranch 'mm/branch-do
c
-updat
e
s' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
M
e
rge branch 'jc/fsck
-
r
e
ti
r
e-requi
r
e-eoh' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge branch
'e
t
/http-
p
roxy
a
uth
'
in
t
o
maint
commit
|
commitdiff
|
tree
2015-07-27
J
u
nio C H
a
m
ano
Merge branc
h
'jc/unexport-g
i
t-page
r
-i
n
-u
s
e
-in-pager
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
J
unio C Hamano
Merge br
a
n
c
h 'mh
/
s
t
rbuf-read-file-returns-ssi
z
e
-t'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
J
unio C Hamano
M
e
rge bran
c
h
'kb/co
n
fig-unmap-before-renaming' into
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge branch 'jk/rev-list-n
o
-bitmap-whil
e
-pruning'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
J
u
nio C
H
a
m
ano
Merge
b
r
anch
'
rh/test-c
o
lor-avoid-terminfo-in-
o
riginal
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
J
u
n
io C Hamano
Merge b
r
an
c
h 'j
k
/fix-refre
s
h-utime' into mai
n
t
commit
|
commitdiff
|
tree
2015-07-27
Junio C H
a
mano
Merge bra
n
ch 'cb/re
b
ase-am-exit-code' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
H
amano
Mer
g
e branch 'jk/index-pack-red
u
ce-recheck'
i
nto maint
commit
|
commitdiff
|
tree
2015-07-24
Junio C
H
a
m
ano
RelNotes:
a
m
.
threeWay
d
oes not exi
s
t (yet)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
Rev
e
rt "git
-
a
m
: add am
.
threeWay config v
a
riable"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
J
unio C
Hamano
Git 2
.
5
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
J
u
nio C
Ham
a
no
Me
r
ge branch '
t
f/gitw
e
b-typo
f
ix'
commit
|
commitdiff
|
tree
2015-07-21
Junio
C
Hamano
Merge tag
'l10n
-
2
.
5
.
0-rnd2'
of git
:
//github
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2015-07-21
Jeff King
strbuf: make
s
t
r
buf_addftime mor
e
r
obust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
SZEDER Gábor
b
a
sh prompt:
f
aster
unt
r
acked statu
s
indicator with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
SZEDER Gábor
bas
h
prom
p
t: tes
t
untracked file
s
s
t
atus
indicator
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Ta
n
t3901:
te
s
t g
i
t
-
am encodin
g
c
o
nve
r
sion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t34
1
8: no
n
-interactive reba
s
e --cont
i
nue
wit
h
rere
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
a
n
t
4150:
t
ests for a
m
--
[
no-
]
scissors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l Tan
t4150: am with post-app
l
ypatch hook
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l Tan
t4150:
am with
p
r
e
-apply
p
atch ho
o
k
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
t41
5
0: am
with a
p
p
l
ypa
t
ch-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
Pau
l
Ta
n
t4150: am --resolved fails
i
f
i
nde
x
has unmerged entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Ta
n
t
4150: am --resolv
e
d
fails if index has no chan
g
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t4150
:
a
m refu
s
es patche
s
when
paused
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
a
n
t4151: am --
a
bort wi
l
l keep dir
t
y index
i
ntact
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am fai
l
s
i
f in
d
e
x
is dirt
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-17
Char
l
es B
a
iley
untra
c
ked:
fix detection
o
f uname(2) fail
u
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-17
Junio C Hamano
M
e
r
ge branch 'jk/still-in
t
e
r
e
sting'
commit
|
commitdiff
|
tree
2015-07-17
J
u
nio C Hamano
Me
r
ge branc
h
'es/
w
o
r
ktree-add
'
commit
|
commitdiff
|
tree
2015-07-17
Eric Sunshine
Documentati
o
n/git:
f
ix stale "MULTIPL
E
CHE
C
KO
U
T MODE
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
Junio
C
Hamano
w
o
r
ktre
e
: c
a
ution t
h
a
t th
i
s i
s
stil
l
expe
r
imenta
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
Eric Sunshine
Docume
n
tation/git-worktr
e
e: fix stale "git
checkout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next