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: handle stray state directory
2015-08-05
P
a
u
l
T
a
n
b
u
il
t
i
n-am: handle stray state directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-am: bypass g
i
t-mailinfo
w
hen --rebasin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin-am: i
m
plement --rebasing mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement --3way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
ca
c
he-
t
ree:
i
ntrod
u
c
e write_index_
a
s_tree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: i
m
plement -s/--signo
f
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am: exit w
i
th us
e
r
friendly
m
essage on failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
i
n
-am:
i
m
p
lem
e
n
t -q
/
--quiet
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-
a
m: reject patches when there's a sessi
o
n in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: im
p
lement --a
b
ort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement --skip
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builti
n
-a
m
: don't
p
arse mail
w
hen r
e
sumin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
imp
l
ement
--resolved
/
-
-
continue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
bui
l
tin-am: re
f
use to appl
y
patches if inde
x
i
s
dirt
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am:
i
m
p
le
m
en
t
committing applied patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am: apply p
a
tc
h
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 patch
a
nd commit i
n
fo with
g
i
t
.
.
.
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
T
an
builtin-am: auto-dete
c
t 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
Pa
u
l Tan
b
u
iltin-am: split out mbox/maildir patches
wi
t
h
g
i
t
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l T
a
n
builtin-am: imple
m
e
nt patch q
u
eue 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
b
uiltin-am: i
m
plement skel
e
t
al 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
wr
a
p
p
er: implement 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: imp
l
ement xopen()
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
n
i
o C Haman
o
Me
r
ge branch 'jk/date-mode-format'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C Hamano
Merge
b
ranch 'pt/
a
m
-
t
est
s
'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hamano
Merge branch 'sg/bash-prompt-untrac
k
ed-optim
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
Hamano
Merge branch
'cb
/
una
m
e-in-untracked'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
i
o
C Hamano
Merge branch
'
se
/
doc
-
checko
u
t-ours-theirs'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch 'i
b
/scrip
t
e
d-parse
-
opt-better-hint-string'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
am
a
no
Mer
g
e
br
a
nch 'mh/fast-import-optimi
z
e-
c
urren
t
-from'
commit
|
commitdiff
|
tree
2015-08-03
Junio C H
a
mano
M
erge
branch 'kn/tag-do
c
-fix'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o
C
Hamano
M
e
rge b
r
an
c
h 'mh/fast-import-get-ma
r
k
'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C
Ha
m
ano
Merge branch
'
gr/r
e
base-
i
-drop
-
warn'
commit
|
commitdiff
|
tree
2015-08-03
Junio C H
a
m
ano
Merge branch 'jc/commit-slab'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
H
amano
Merge bra
n
ch 'dt/log-follow-config'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
Hamano
Merge branch 'gp/status-rebase-i-inf
o
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge
branch 'jk/
c
at-
f
ile-batch-a
l
l'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hama
n
o
Merge branch 'js/fsck-opt'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C Hama
n
o
Merge br
a
nch 'mh/i
n
it
-
delete-refs-api'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch 'pt/p
u
ll-builtin'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o
C Hamano
Me
r
ge bra
n
ch
'jk/p
k
t
-
l
og
-
pack'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Ha
m
a
n
o
Merge b
r
anch 'm
r
/
r
ebase-i-customize-insn-sheet'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch 'rl/send-email
-
alias
e
s'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch
'kb/i18n-
d
oc'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hamano
M
e
rge b
r
anc
h
'nd/
e
x
port-worktree'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
Ha
m
ano
Merge branch 'ee/
c
lean-re
m
ov
e
-dirs'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Hamano
Merge branch 'cb/parse-magni
t
ude
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
am
a
n
o
Mer
g
e branch 'bc/gpg-v
e
rify-
r
aw'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
M
e
rge branch
'pt/am-f
o
reign'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
M
erg
e
branch 'kn/for-
e
a
ch-r
e
f'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
amano
M
e
r
ge branch 'mh/replac
e
-re
f
s'
commit
|
commitdiff
|
tree
2015-08-03
Karthik N
a
yak
ref-filter
:
make 're
f
_a
r
ray_item
'
use
a FLEX
_
A
RRAY
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Karth
i
k N
a
yak
for
-
each-ref: introduce 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
Kart
h
ik
N
a
yak
ref-filter:
m
ove code fr
o
m
'
f
o
r
-
each-ref'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
G
it
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
io C Hamano
Syn
c
with 2
.
4
.
7
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Hamano
G
it
2
.
4
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
i
o
C
Hama
n
o
M
e
rg
e
b
ranch '
j
k/pretty-encodi
n
g
-
doc
'
into
m
aint
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C
Hamano
Merge branch '
t
b
/
c
h
ec
k
out-doc' into
m
aint
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
io C Ham
a
no
Merge b
r
anch
'ls/hint-re
v
-l
i
st-count' into m
a
int
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C H
a
mano
Merge
branch 'mm/branch-doc-upd
a
tes'
i
nt
o
maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge br
a
n
ch
'jc
/
fsck-retire-require-eoh' i
n
to maint
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
i
o C Ham
a
no
Merge
branch '
e
t/ht
t
p
-
proxyauth' into ma
i
nt
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
io C
H
am
a
n
o
M
e
r
ge branch
'jc/u
n
export-
g
it-pag
e
r-
i
n-u
s
e-in
-
pager
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C
H
amano
Merge branch 'mh/strbuf
-
re
a
d
-file-retu
r
n
s-ss
i
ze-t
'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C Hamano
M
e
rge
b
ra
n
ch 'kb/co
n
fig-unmap-before-renaming'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
J
unio
C
Hamano
Merge branch
'
jk/re
v
-list-no-bitmap
-
while-p
r
uning'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C Hamano
Merge branch 'rh
/
test-color-a
v
oid
-
terminfo-in-origina
l
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hama
n
o
Merge branch 'jk/fix-refresh-utime
'
into
maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C H
a
m
ano
M
erge bra
n
ch 'cb/
r
ebase-am-exit-code' int
o
maint
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C Hamano
M
e
rge
b
ranch 'jk/
i
ndex-pack-redu
c
e-recheck' int
o
maint
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
R
elNotes:
am
.
threeWay does not ex
i
st (yet)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
J
u
nio C Hamano
Revert "git-am:
a
dd am
.
threeWay c
o
nfig variable
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Junio C H
a
m
a
no
Git 2
.
5
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Juni
o
C
H
amano
Mer
g
e branch 'tf/g
i
t
w
e
b-typofix'
commit
|
commitdiff
|
tree
2015-07-21
J
u
ni
o
C
Ha
m
a
n
o
Me
r
ge
t
a
g 'l10n-2
.
5
.
0
-rnd2' of git:/
/
github
.
com/
g
it
.
.
.
commit
|
commitdiff
|
tree
2015-07-21
Jeff King
strbuf:
make strbuf_addftime more robust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
SZEDER Gábor
bash
p
r
ompt:
f
aster untracked
s
tatus indicato
r
with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
SZ
E
DE
R
Gábor
b
a
sh
prom
p
t:
t
est untracked files
s
t
a
t
us indi
c
at
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3901: tes
t
g
i
t-am encoding conversion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3418: non-intera
c
tive rebase --continue wi
t
h rerere
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t415
0
: tests
f
or am --[
n
o-]sciss
o
rs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t4150: am with
p
ost
-
applypatch h
o
ok
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
wi
t
h pre-
a
pplypa
t
ch 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
w
ith app
l
ypatch-ms
g
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 T
a
n
t
4
1
50: am --
r
es
o
lved fails if ind
e
x
has unmerged entrie
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l Ta
n
t
4
150: am --reso
l
ved f
a
ils
if index has
n
o c
h
anges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul T
a
n
t4150: am refuses patches when paused
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t415
1
: am --abort will
keep dirty in
d
e
x
i
nt
a
ct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t4150: am fails if inde
x
i
s
dirty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-17
Charl
e
s Bailey
untr
a
cked: fix dete
c
tion of uname(2)
f
ailur
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-17
J
unio C H
a
mano
M
erg
e
b
r
anc
h
'j
k
/still-
i
nterest
i
ng'
commit
|
commitdiff
|
tree
2015-07-17
Ju
n
io C Hamano
Merge branch 'es/worktree-
a
dd
'
commit
|
commitdiff
|
tree
2015-07-17
Eric S
u
nshine
Docu
m
entat
i
o
n
/git: fix stale
"M
U
LTIPLE
CHECKOUT MODE
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
Junio C Hamano
w
o
rktree: caution t
h
at this is st
i
ll exp
e
r
i
me
n
tal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
Eric Sunshi
n
e
Documentation/gi
t
-worktree:
f
ix stal
e
"git chec
k
out
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-15
Jun
i
o
C Hamano
S
y
nc with 2
.
4
.
6
commit
|
commitdiff
|
tree
2015-07-15
Junio
C
Hamano
Git 2
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-15
J
unio
C
H
a
ma
n
o
Merge branch 'jc/diff-ws-err
o
r-
h
i
ghlight
'
commit
|
commitdiff
|
tree
2015-07-15
J
u
nio C Hamano
Merge branch 'mm/de
s
crib
e
-doc' into maint
commit
|
commitdiff
|
tree
next