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: implement -k/--keep, --keep-non-patch
2015-08-05
Pa
u
l Tan
buil
t
in
-
am: implement -k/--keep, --keep-non-patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin-
a
m: imp
l
e
me
n
t -u/--ut
f
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-am:
h
a
n
dle stray state
d
ir
e
ctory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builtin-
a
m: bypass
git-mailinfo when --rebasi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
b
u
iltin-am: implement
-
-
rebasing mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: impl
e
ment --3w
a
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
cache
-
tree: introduc
e
write_in
d
ex_
a
s_tre
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implem
e
nt
-s/--si
g
noff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builti
n
-am: exit with user fr
i
endly message on failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-am:
implement -q/--quiet
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: reject patches whe
n
there's a sessio
n
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builtin-am: implement -
-
a
bort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin-am: implement
-
-skip
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am: don't pars
e
m
ail when resu
m
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
bu
i
ltin-am: imp
l
emen
t
-
-
resolved/--con
t
inue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
il
t
in-am:
r
e
fu
s
e to
appl
y
pat
c
hes
if index is
dirty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builtin-am: imp
l
em
e
n
t
c
ommit
t
ing applied patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul T
a
n
b
u
i
lt
i
n-
a
m: a
p
ply patch 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
builtin-am: extract p
a
t
c
h and 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
b
u
iltin
-
a
m
: auto-detect m
b
ox 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
bui
l
tin-am: s
p
lit
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
builti
n
-a
m
: i
m
plement
p
a
t
ch 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-am: im
p
leme
n
t skeletal builti
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 Tan
wrapper: implement xfopen()
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
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
Junio C Hamano
Me
r
ge branch 'jk/d
a
te-mode-format'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C
Hamano
M
erge branch 'pt/am-tests'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch 's
g
/bash-prompt-un
t
r
a
cke
d
-optim'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Hamano
Merge b
r
a
nc
h
'cb/uname-in-untrac
k
ed'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Haman
o
Merge bran
c
h 'se/d
o
c-c
h
eckout-our
s
-theirs'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C H
a
m
a
no
Me
r
ge br
a
nch 'ib/scripted-parse-opt-better-
h
int-string'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge b
r
anch 'mh/fast
-
i
mpor
t
-o
p
t
imize-current-from'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge bran
c
h
'
kn/tag-doc-
f
ix'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Haman
o
Merg
e
branch 'mh/fas
t
-impo
r
t-get
-
mark'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hamano
Merge bran
c
h
'gr/reba
s
e
-
i-drop-war
n
'
commit
|
commitdiff
|
tree
2015-08-03
J
un
i
o C
Hamano
Merge branc
h
'j
c
/comm
i
t-slab'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Hama
n
o
Me
r
ge
branch 'dt/log-follow-config'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
M
erge branch 'gp/status-rebas
e
-i
-
inf
o
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C H
a
ma
n
o
Merge branch 'jk/cat-fil
e
-batch-all'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Haman
o
M
erg
e
branch 'js/fsck
-
o
p
t'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
M
erge branch '
m
h/init
-
d
el
e
t
e-refs-api'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C Hamano
Merge branch
'
pt
/
pul
l
-builtin'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
H
amano
Merge
branch 'j
k
/pkt-log-pac
k
'
commit
|
commitdiff
|
tree
2015-08-03
J
u
n
io C
H
amano
Merge branch
'mr
/
rebase-i
-
customize-insn
-
s
h
e
et'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Mer
g
e branch 'rl/send-
e
mail-al
i
a
ses'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
i
o
C Hamano
Merg
e
b
r
a
n
ch
'
k
b/i18n-doc'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branc
h
'nd/export-worktree'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Hamano
Merge
branch 'ee/clean-remove-dirs'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C Ham
a
no
Merge branch 'cb/pa
r
se
-
magnitude'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C Ham
a
no
Me
r
g
e branc
h
'bc/
g
p
g
-verify-raw'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
am
a
no
Merge branch 'pt/am-fore
i
g
n
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hama
n
o
Merge branc
h
'
kn/fo
r
-each-ref'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Haman
o
Merge bra
n
c
h
'mh/repla
c
e
-
re
f
s
'
commit
|
commitdiff
|
tree
2015-08-03
K
a
rthik Na
y
ak
ref-filter: mak
e
'ref_ar
r
ay_item' use
a
FLEX_ARRAY
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Karthik
Nayak
for
-
e
a
c
h-ref: introduce filter_re
f
s
(
)
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Kart
h
ik N
a
ya
k
ref-filter: move c
o
de from 'for-each-ref'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Ham
a
no
Git 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
io
C
Hamano
Sync with
2
.
4
.
7
commit
|
commitdiff
|
tree
2015-07-27
J
u
n
io C Haman
o
Git 2
.
4
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
J
u
n
i
o
C
H
amano
Merge bran
c
h
'jk/pretty
-
en
c
oding-d
o
c
'
into maint
commit
|
commitdiff
|
tree
2015-07-27
J
unio C
H
am
a
no
M
e
rge b
r
anc
h
'tb/
c
heckou
t
-doc'
i
n
to m
a
int
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hama
n
o
Merg
e
b
ranch 'ls/hint
-
r
e
v
-
list-count' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C
H
amano
Merge branch 'mm/branch-doc-updates' into
maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Haman
o
Merge
branch 'jc/fsck-retire-require-eoh' into maint
commit
|
commitdiff
|
tree
2015-07-27
J
unio C Hamano
Merge branch 'et/http-pr
o
xyaut
h
' into m
a
int
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o
C
Hamano
Merge bran
c
h 'j
c
/unexport-git-p
a
ger-in-use-
i
n-pager
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C
Hamano
Merge branch
'mh
/
s
t
rbuf
-
read-f
i
l
e-returns-ss
i
ze-t'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Hamano
Merge
branch 'k
b
/config-unmap-befo
r
e-renaming' into
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge
bran
c
h
'
jk/re
v
-list-no-bitm
a
p-while
-
pruning'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ha
m
ano
Merge branch 'rh/t
e
st-color-avoid
-
termin
f
o-in-original
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C
Hamano
Merge bran
c
h 'jk/fix-refresh-ut
i
me' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge branch '
c
b
/
rebase-
a
m-exit-code' in
t
o
m
aint
commit
|
commitdiff
|
tree
2015-07-27
J
unio C Ha
m
ano
Me
r
ge branch '
j
k/index-pack-reduce-
r
echeck'
into
mai
n
t
commit
|
commitdiff
|
tree
2015-07-24
J
u
n
i
o
C
Hama
n
o
R
e
l
N
otes: am
.
thre
e
Way
d
oes not exist (y
e
t)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Juni
o
C Hamano
Revert "git
-
a
m
: add am
.
threeWay config variable"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Junio C Hama
n
o
G
it 2
.
5
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Ju
n
io C Haman
o
Merge branch 'tf/gitweb-
t
y
p
ofix'
commit
|
commitdiff
|
tree
2015-07-21
J
unio
C
H
a
mano
Merge t
a
g '
l
1
0
n-
2
.
5
.
0-
r
nd2' of git://github
.
c
om/git
.
.
.
commit
|
commitdiff
|
tree
2015-07-21
Je
f
f Kin
g
strbuf: ma
k
e st
r
bu
f
_addftime
m
ore robust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
S
ZEDER Gá
b
or
bash prompt:
f
as
t
er untracked status
i
ndicator
w
ith
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
SZEDER Gábo
r
bash prompt
:
test untracked files status
i
ndicator
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t3901: te
s
t
git-am enc
o
ding conversion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t341
8
: non-intera
c
tive reba
s
e --continue with
r
erere
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l
Tan
t4150: tests for
am -
-
[no-]s
c
i
s
s
o
rs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am w
i
th po
s
t-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
P
aul Tan
t415
0
:
am with pre
-
applypatch 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
Pau
l
Tan
t4150: am
w
i
t
h appl
y
patch-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 --resolved fails if index has
u
n
m
erged
e
nt
r
ies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l Tan
t4
1
50: am --resolv
e
d fails
if index
has
n
o
chan
g
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4150: a
m
re
f
u
ses p
a
tches
wh
e
n pause
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
415
1
: am --abort wi
l
l k
e
ep dirt
y
index intact
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150:
a
m fai
l
s
i
f index is di
r
ty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-17
C
harles Bailey
untrac
k
ed: f
i
x
d
e
tection of uname(2) failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-17
Junio C Hamano
Merge b
r
a
n
c
h 'jk/still-inte
r
esting'
commit
|
commitdiff
|
tree
2015-07-17
Junio
C
Hamano
Merge branch
'
es/worktree-
a
dd'
commit
|
commitdiff
|
tree
2015-07-17
E
ric Sunshin
e
Doc
u
menta
t
ion/git: fix stale "MULT
I
PLE
CHECKOUT MODE
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
Jun
i
o C Hamano
worktr
e
e: caution that this is still experimental
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
Eric
S
unshine
Documentation/git-
w
orktree: fix stale
"
gi
t
c
heckout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-15
Junio C Haman
o
Sync
w
it
h
2
.
4
.
6
commit
|
commitdiff
|
tree
2015-07-15
Junio C
Hamano
G
i
t 2
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next