repo.or.cz
/
alt-git.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 --rebasing mode
2015-08-05
Paul Tan
builtin-am: imple
m
ent --rebasin
g
m
o
de
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
buil
t
in-am: implement --3way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
cache-tree: introduce write_index_as
_
tr
e
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uiltin-am
:
imple
m
ent -s/--
s
i
g
n
of
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin-am: exit with u
s
er
f
riendly
m
e
ssa
g
e 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
/
--
q
u
iet
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-am: reject patches when
the
r
e'
s
a ses
s
i
o
n
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement --abort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
i
mplement --skip
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin-
a
m: don't pa
r
se mail when resuming
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l T
a
n
builtin-am
:
implement --resolved/--con
t
inue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l Tan
b
u
iltin-am: refuse to a
p
ply patc
h
e
s if index is
dirty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
buil
t
in-
a
m:
implement
c
ommitting
a
p
plied patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin-am:
apply patch with g
i
t
-
a
pply
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul T
a
n
builtin-am: extract
patch a
n
d commit i
n
f
o wi
t
h git
.
.
.
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
built
i
n-a
m
: au
t
o-detect mbox patc
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
P
aul Tan
buil
t
in-am: split out mbox/m
a
il
d
ir pa
t
c
h
es 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
Pa
u
l Tan
builtin-a
m
: implement 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 T
a
n
builtin-am: implem
e
nt skele
t
al bu
i
l
t
in 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: imp
l
ement 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 Tan
wrapper: imp
l
emen
t
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
Junio C H
a
mano
Merge
b
ranch 'jk/date-mode-for
m
at'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hamano
Merge bra
n
c
h
'pt/am
-
tests'
commit
|
commitdiff
|
tree
2015-08-03
J
u
n
i
o
C Ham
a
no
Merge br
a
nch
'sg/
b
ash-prompt-untracked-
o
ptim'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hamano
Merge
b
ranch 'cb/uname-in-
u
ntracke
d
'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Hamano
Merge
br
a
nch '
s
e/doc-checkout-ours-t
h
eirs'
commit
|
commitdiff
|
tree
2015-08-03
Junio C H
a
mano
Merge br
a
nc
h
'ib/script
e
d-parse-opt-better-hint-st
r
ing'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge
branch 'm
h
/fas
t
-import
-
o
p
t
i
mize-current-
f
rom
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Haman
o
Merge bra
n
ch
'
kn/tag-doc-fi
x
'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C Hama
n
o
M
e
rge branch 'mh/fast-import-
g
et-ma
r
k'
commit
|
commitdiff
|
tree
2015-08-03
Junio C H
a
mano
Merge branch 'gr/
r
ebase-i-drop-warn'
commit
|
commitdiff
|
tree
2015-08-03
J
un
i
o C
Hamano
Merge bra
n
ch 'jc/commit-slab
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch
'
dt/log-foll
o
w
-
confi
g
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
Ham
a
no
Merge br
a
nch '
g
p/status-reb
a
s
e
-i
-
info'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch 'jk/
c
at-fi
l
e-ba
t
c
h-all'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hama
n
o
M
e
r
g
e
b
ranch 'js/fs
c
k-opt'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
amano
M
erge bran
c
h 'mh/init-d
e
l
e
t
e
-refs-api'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C
Hamano
Mer
g
e branch 'pt/pull-b
u
iltin'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
H
amano
Merge branch
'
jk/p
k
t-log-p
a
c
k
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ham
a
no
M
erge b
r
anch 'm
r
/
r
eb
a
se-i-
c
ustomiz
e
-ins
n
-sheet'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C
Hamano
Merge
branch 'rl/send-email-alia
s
es'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Mer
g
e branch 'kb
/
i18n
-
doc'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Hamano
Mer
g
e
b
r
a
nch '
n
d/export
-
worktree'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io
C Hamano
Me
r
ge branch 'e
e
/clean-re
m
ove-dir
s
'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Hamano
Merge
b
ranch 'cb/parse-magnitude'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Hamano
Merge branc
h
'bc/gpg-verify
-
raw'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Haman
o
Me
r
ge br
a
n
c
h
'pt/am-
f
oreign'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C
H
amano
Merge branc
h
'kn/for-ea
c
h-
r
ef'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch 'mh/replace-refs'
commit
|
commitdiff
|
tree
2015-08-03
Kar
t
h
i
k
Naya
k
re
f
-filter: mak
e
'ref_array_item'
u
s
e
a
F
L
EX_ARRAY
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Karthik Nayak
for-each
-
r
e
f:
i
ntro
d
uce fi
l
ter_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-filte
r
: move code from 'for-ea
c
h-re
f
'
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
J
u
nio C Hama
n
o
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 Ham
a
n
o
Merge br
a
nch 'jk/pretty-encoding-
d
o
c
'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C
Hama
n
o
Merge branch
'
tb/checkout-doc' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge branch
'ls/h
i
nt-
r
ev-list-co
u
nt' i
n
to
m
aint
commit
|
commitdiff
|
tree
2015-07-27
Junio C
Hamano
M
e
rge b
r
a
n
ch 'mm/branc
h
-d
o
c
-updates' into mai
n
t
commit
|
commitdiff
|
tree
2015-07-27
J
u
nio C H
a
mano
Merge branch 'jc/fsck-retire-re
q
uire-eoh'
into
ma
i
nt
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C Hamano
Merge branch 'et/http
-
pr
o
x
y
auth' into
maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C H
a
mano
Merge branc
h
'jc/unexp
o
rt-git
-
pager-in-
u
se-
i
n-pager
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C H
a
mano
Merge bran
c
h 'mh/
s
trbuf-read-file-returns-ssize-t'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C Hamano
Merge br
a
nch 'k
b
/config-unmap-before-rena
m
ing'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C Hamano
Me
r
ge branch 'jk
/
rev-list-no-bitmap
-
while-pruning'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio
C Hamano
Merge branch
'
rh/test
-
color-a
v
oid-terminfo-in-orig
i
nal
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
io C H
a
mano
Merge branch 'jk/fix-refresh-u
t
ime' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ha
m
ano
Merge b
r
anch 'cb/reb
a
se-am-exit-co
d
e'
i
nto maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge
b
r
anch 'jk/index-pack-reduce-recheck' into
maint
commit
|
commitdiff
|
tree
2015-07-24
Ju
n
i
o C Haman
o
RelNotes: am
.
t
h
reeW
a
y does
not exist (ye
t
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Jun
i
o C Ham
a
no
Revert
"git-am
:
a
dd am
.
th
r
eeWay co
n
fi
g
variable"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Junio 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
H
am
a
no
Merge branch 'tf/
g
itweb-typ
o
fix'
commit
|
commitdiff
|
tree
2015-07-21
Junio C Ham
a
no
Me
r
ge tag
'l10n-2
.
5
.
0-
r
nd2'
o
f git
:
//g
i
thub
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2015-07-21
Je
f
f
King
strbuf: mak
e
strbuf_a
d
dfti
m
e more ro
b
ust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
S
Z
EDER Gáb
o
r
bash pr
o
mpt:
faster untra
c
ke
d
st
a
tus i
n
di
c
a
t
or with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
SZEDER Gábor
b
a
sh prompt: test un
t
r
acked f
i
l
e
s sta
t
u
s
indicator
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3901: t
e
st git-am encoding
c
onversion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3418: n
o
n-in
t
era
c
tive rebase -
-
co
n
tinue with rerere
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4
1
50:
tests for am --[no-]scissors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Ta
n
t4
1
50
:
a
m
with post-applypa
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
T
a
n
t4150: am wi
t
h 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 w
i
th 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
an
t41
5
0:
am --resolved fails if index has
u
nmerg
e
d entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Pau
l
Tan
t4150:
am --resolved fails if index h
a
s no ch
a
nges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am refuses patches when pau
s
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t415
1
: am --a
b
ort wi
l
l
k
eep dir
t
y
i
ndex intact
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
Tan
t
415
0
: am fails if
i
nde
x
is dirt
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-17
Charle
s
B
ail
e
y
untr
a
cked: fix detection of
una
m
e(2)
f
ailure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-17
Juni
o
C H
a
mano
M
e
rge bran
c
h 'jk/
s
till-
i
nt
e
resting
'
commit
|
commitdiff
|
tree
2015-07-17
Jun
i
o C Hama
n
o
Merge
branch 'es/worktree
-
a
d
d'
commit
|
commitdiff
|
tree
2015-07-17
Er
i
c Sunshine
D
o
cumentat
i
on
/
git:
fix
stale "MULTIPLE CHEC
K
O
U
T MOD
E
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
Junio C Hamano
worktree:
caution th
a
t this i
s
s
t
ill e
x
p
erimen
t
a
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
E
ric
Suns
h
ine
Documentation
/
gi
t
-worktree: fix
s
t
ale
"git checkou
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-15
Junio C H
a
mano
Sync with
2
.
4
.
6
commit
|
commitdiff
|
tree
2015-07-15
J
u
ni
o
C Haman
o
Git 2
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-15
Jun
i
o C Hamano
Merge branch 'jc/di
f
f-ws-error-highlight'
commit
|
commitdiff
|
tree
2015-07-15
J
u
nio C
Hama
n
o
M
erge branch
'
m
m
/describ
e
-
d
o
c' in
t
o
maint
commit
|
commitdiff
|
tree
2015-07-15
Juni
o
C H
a
mano
Mer
g
e
b
r
a
nch 'jc
/
prompt-
d
ocument-ps1-
s
t
a
te-sep
a
r
ator
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
Jun
i
o
C
Hamano
Merge
b
r
anch 'es/osx-header-p
o
llutes-mask-macro'
i
nto
.
.
.
commit
|
commitdiff
|
tree
next