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
Paul
Tan
built
i
n-am: handle
stray state directory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-am: bypass git-m
a
ilinf
o
w
h
en --reb
a
sing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement --re
b
a
s
ing mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l
Tan
builtin-am
:
implement --3wa
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
cache-tree: introdu
c
e
w
r
i
te_in
d
e
x_as_tree()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uil
t
in-a
m
: implemen
t
-s/--sign
o
ff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: e
x
it w
i
th
u
ser friendly messa
g
e on failure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin
-
am: implement -q
/
--q
u
i
et
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
T
a
n
b
uiltin-am
:
reject pat
c
hes when there's a
sess
i
o
n i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-a
m
: i
m
pl
e
m
e
nt
-
-abo
r
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin
-
am: imple
m
e
n
t -
-
skip
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am:
don't parse ma
i
l whe
n
resumin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Ta
n
b
uiltin-
a
m: implement --reso
l
v
e
d
/--con
t
inue
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul T
a
n
builtin-am:
r
efuse to a
p
p
l
y patc
h
es i
f
i
n
dex is
d
irty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin-am: implement committing applied patch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul T
a
n
builtin-am: 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
P
a
ul Ta
n
builtin-am: extract
pat
c
h and commit info wit
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
Paul Tan
b
u
ilti
n
-a
m
:
auto
-
detect mbox
pat
c
h
es
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
builtin-am
:
split out mbox/maildir patches w
i
th
g
it
.
.
.
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-a
m
: i
m
p
lement 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
bu
i
ltin-am: impl
e
men
t
skeletal b
u
iltin am
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
wrapper: implement xf
o
p
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
rapper:
i
m
pl
e
ment xopen()
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C
Hamano
Merge b
r
anch
'
jk/
d
ate-mode-fo
r
mat'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C Ha
m
a
n
o
Me
r
g
e
bra
n
ch 'pt
/
am-tests'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C
H
a
mano
Merge branch '
s
g/bash-pro
m
p
t
-untracked-opti
m
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Mer
g
e branch 'cb
/
un
a
me-in-untracked'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Hamano
Me
r
ge
b
ranch
'
se/doc-che
c
kout-ours
-
theirs
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Haman
o
Merge branch
'
i
b
/s
c
r
i
pted-parse
-
opt-better-hint-stri
n
g'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Hamano
Merge br
a
nch 'mh/fast-imp
o
r
t
-o
p
timiz
e
-curren
t
-from'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C
H
a
ma
n
o
M
e
rge
b
ranch
'kn/tag-doc
-
f
i
x
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch
'
m
h
/
f
ast-import-get-ma
r
k'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merg
e
br
a
nc
h
'gr/rebas
e
-
i-
d
rop-warn'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merg
e
branch 'jc/commit-slab'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Hamano
Me
r
ge b
r
an
c
h 'dt/log
-
follo
w
-config'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
am
a
no
Me
r
ge br
a
nch 'gp
/
s
ta
t
us-rebase-i-info'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C Hamano
Merge br
a
nch 'jk/cat-file-batch-a
l
l'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hamano
Mer
g
e branch 'js/fsck-opt'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch
'
mh/init-delete-refs
-
api'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Hamano
M
e
rge branch 'pt/pull-builtin'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C Hama
n
o
Me
r
ge bran
c
h 'jk/pkt-log-pac
k
'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Hamano
Merge branch 'mr
/
rebas
e
-
i
-
c
ustomize-
i
n
sn-sheet'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C Hamano
Merge branch 'rl/
s
en
d
-email
-
aliases'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ha
m
ano
Merge branch '
k
b
/
i
18n-doc'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merg
e
b
ranch
'
nd/export-worktree'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C
Hamano
Merge branch 'ee
/
clean-remove-dirs
'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C
Haman
o
Merge branch 'cb/
p
ars
e
-m
a
gnitude'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C Ham
a
no
Merge b
r
anch '
b
c/gpg-verify-
r
a
w'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Haman
o
M
e
rge branch 'pt/am-foreign'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C Hamano
M
e
rge bran
c
h 'kn/for-ea
c
h
-
ref'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C Hamano
M
e
rg
e
branch 'mh/replace-refs'
commit
|
commitdiff
|
tree
2015-08-03
Karthik Nayak
ref-filter: make 'ref_array_item' use
a
FLEX
_
A
RRAY
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-03
Karthik Nayak
f
o
r-each-ref: int
r
odu
c
e filter_r
e
fs()
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-03
K
art
h
ik Nayak
r
e
f-filter: move co
d
e from 'for-ea
c
h-ref
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Hamano
Gi
t
2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Sy
n
c wit
h
2
.
4
.
7
commit
|
commitdiff
|
tree
2015-07-27
J
u
nio C Hamano
Git 2
.
4
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-27
J
u
nio C Hamano
M
e
rge b
r
anch 'j
k
/pretty-enco
d
ing-doc' into mai
n
t
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge br
a
nch 'tb/c
h
e
c
kout-doc' int
o
m
a
int
commit
|
commitdiff
|
tree
2015-07-27
Junio C
H
amano
M
e
rge bran
c
h
'ls/hint-
r
ev-list-count
'
into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ham
a
no
Me
r
ge branch '
m
m/bran
c
h
-doc-updat
e
s' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hama
n
o
Merge branch
'
jc/fsck-retire-r
e
quire-eoh' int
o
maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ham
a
no
Merg
e
bra
n
ch 'et/h
t
t
p-proxyaut
h
' into ma
i
nt
commit
|
commitdiff
|
tree
2015-07-27
J
uni
o
C Hamano
Merge
branc
h
'jc/unexport-git
-
pa
g
e
r
-in-
u
se-in-pager
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C
Hamano
Me
r
ge branch 'mh/strbuf-read-file-
r
etur
n
s-ssize-t'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C
H
amano
Merge branch 'k
b
/config-unmap-before-renaming' into
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C Hamano
M
e
rge branch 'j
k
/
r
e
v-list-no-bitmap-whi
l
e-pruning'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Me
r
g
e
branc
h
'rh/test-color-avoid
-
ter
m
info-in-origi
n
a
l
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
J
u
nio
C Hamano
Merge branch 'jk/fix
-
re
f
resh-utime
'
i
nto maint
commit
|
commitdiff
|
tree
2015-07-27
Junio
C Hamano
M
e
r
ge br
a
nch 'cb/rebase-
a
m-exit
-
c
o
d
e
' into ma
i
nt
commit
|
commitdiff
|
tree
2015-07-27
J
unio C Hamano
M
erge bra
n
c
h
'jk/index-pack-
r
educ
e
-recheck' into maint
commit
|
commitdiff
|
tree
2015-07-24
Ju
n
io
C
H
am
a
n
o
RelNotes: am
.
threeWay d
o
e
s no
t
exist (y
e
t)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hama
n
o
Revert
"
git
-
am: a
d
d am
.
thre
e
Way config vari
a
ble"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-21
Junio C H
a
mano
Git 2
.
5
.
0-rc
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-21
J
unio
C
Hamano
Merge branch '
t
f/gitweb-typofix
'
commit
|
commitdiff
|
tree
2015-07-21
Ju
n
io C Hamano
Merge tag
'
l10n-2
.
5
.
0-rnd2' of
g
it://github
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2015-07-21
Jeff King
s
t
rbuf: ma
k
e
s
t
r
buf_addftim
e
m
ore
r
obus
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
SZEDER
Gábor
bash prompt:
faster untr
a
c
ked status
i
nd
i
cator with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
SZEDER Gábor
bash pr
o
mpt: tes
t
untracked files status indic
a
tor
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3901: tes
t
git
-
am encoding conv
e
rs
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3418
:
non-inte
r
active rebase
-
-con
t
i
nue with rer
e
re
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150:
t
e
sts for am --[no-]scissor
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4150: am with post-applyp
a
tch
h
ook
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
t41
5
0
:
am with pre-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
t4150:
am with 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
t415
0
: am --resolved fails if index
has unmerge
d
entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul Tan
t4150: am --resolve
d
fails if inde
x
has
n
o changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
a
u
l
T
a
n
t4150:
a
m
ref
u
s
es p
a
tches whe
n
paus
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l Tan
t4151: am --abort w
i
ll
k
e
ep
d
irt
y
index intact
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am fails if index is dirty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-17
Ch
a
rles Bailey
untracked: fix dete
c
tio
n
of u
n
a
m
e
(
2
)
fail
u
re
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-17
Junio C Hama
n
o
Merge branch 'jk/still-inte
r
esting'
commit
|
commitdiff
|
tree
2015-07-17
Junio C Hama
n
o
Merge branch
'es/worktre
e
-add'
commit
|
commitdiff
|
tree
2015-07-17
Eric Sunshine
Documentation/git: fi
x
stale
"MU
L
TIPLE CHEC
K
OUT MODE
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-16
Jun
i
o
C
H
ama
n
o
work
t
ree: caut
i
o
n
tha
t
t
his is sti
l
l expe
r
imental
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-16
E
ric Sunshi
n
e
Documenta
t
ion/gi
t
-worktree: fix st
a
le "git che
c
kout
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
S
y
nc with
2
.
4
.
6
commit
|
commitdiff
|
tree
2015-07-15
Jun
i
o C
Hamano
Git 2
.
4
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-15
Ju
n
i
o C Hamano
Merge branch 'jc/diff-
w
s-error-highlight'
commit
|
commitdiff
|
tree
2015-07-15
Junio
C Ha
m
ano
Merge branch 'm
m
/descr
i
be-doc' into maint
commit
|
commitdiff
|
tree
next