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
Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
2014-11-10
Jun
i
o C Hamano
M
e
rge
branch 'j
c
/conflic
t
-hint' into cc/interpret-trailers
.
.
.
commit
|
commitdiff
|
tree
2014-11-10
Chr
i
stian
C
ouder
trailer: d
i
splay a trailer withou
t
its trailing newline
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-10
Chri
s
tian Couder
trailer: ignore comment
l
ines
ins
i
d
e
the trail
e
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-28
Ju
n
io C Ham
a
no
merg
e
& seq
u
encer: turn "Confli
c
ts
:
"
hint into a commen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-28
J
un
i
o
C
Hamano
builtin/c
o
mmit
.
c: extract ignore
_
non_trailer(
)
h
e
lper
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-24
Junio C Ham
a
no
merge & sequencer: unify codepaths
that wr
i
te "Conflicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-24
Juni
o
C Hamano
builtin/merge
.
c: drop
a par
a
meter that is never used
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Coud
e
r
Document
a
tion: add documentati
o
n for 'git i
n
terpret
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trail
e
r: add tests for commands in config fil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: execute comm
a
n
d
from 'trailer
.
<na
m
e>
.
comm
a
nd'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian C
o
ud
e
r
trailer: add tests for
"git interpret-trailers"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christi
a
n Couder
trailer
:
add int
e
rpret
-
trailers co
m
m
a
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian
Couder
trailer: p
u
t all the proc
e
ssing toge
t
h
e
r and pr
i
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
tra
i
ler: p
a
rse trailers from file or stdin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Chri
s
t
i
an Couder
tr
a
iler: process command line
t
rai
l
er arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Ch
r
i
s
tian C
o
ud
e
r
tr
a
il
e
r: re
a
d a
n
d
process
c
onfig information
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: p
r
ocess trailers from
i
nput message an
d
a
rguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christia
n
Coud
e
r
trailer: ad
d
data structu
r
es and
ba
s
ic f
u
n
c
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-07
Wieland Hoffmann
git
-
t
a
g
.
t
x
t: Add
a
missing hyp
h
en to `-s`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hamano
Update draft relea
s
e
notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-11
Junio
C
Ha
m
ano
M
erge
b
ranch 'br
/
i
map-send-si
m
plify-t
u
nnel-child-proce
s
s'
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hamano
Merge branch 'jk/n
a
me-decoration-alloc'
commit
|
commitdiff
|
tree
2014-09-11
Junio C H
a
mano
Merge br
a
n
c
h
'jn/unpack
-
tree
s
-
check
o
ut-m-c
a
rry-deletion'
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hama
n
o
Mer
g
e branch 'rs/list-optim'
commit
|
commitdiff
|
tree
2014-09-11
J
unio
C Hamano
Merge
branch 'jk/fast-import-fi
x
es'
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hamano
Merge
b
ran
c
h 'j
k
/p
r
un
e
-
top-level-re
f
s
-after-packin
g
'
commit
|
commitdiff
|
tree
2014-09-11
Jun
i
o C
H
amano
Merge branch 'n
d
/
l
ar
g
e-
b
l
obs'
commit
|
commitdiff
|
tree
2014-09-11
Junio C Haman
o
Merge branc
h
'nd/fetch-pass-qu
i
et-to
-
gc-child
-
process'
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hamano
Merge branc
h
'dt/ca
c
he-t
r
ee-repair'
commit
|
commitdiff
|
tree
2014-09-11
J
un
i
o C
Ha
m
ano
M
erge b
r
anch
'rs/r
e
f
-
tr
a
nsaction-1'
commit
|
commitdiff
|
tree
2014-09-11
Junio C
Ha
m
ano
Merge branch '
n
d/mv-code-clean
i
n
g
'
commit
|
commitdiff
|
tree
2014-09-11
J
u
nio C Hamano
M
e
r
ge
b
ranch 'mm/dis
c
our
a
g
e
-
commit-a-
t
o-fi
n
ish-conflic
t
.
.
.
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hamano
Merge branch 'jk/
m
ake-simplify-dependenci
e
s'
commit
|
commitdiff
|
tree
2014-09-11
Jun
i
o C
H
a
mano
M
e
r
ge branch 'et/
s
pell-pol
l
-infin
i
te-wit
h
-minus-one
.
.
.
commit
|
commitdiff
|
tree
2014-09-11
Junio C H
a
man
o
Merge branch 'b
r
/http-init
-
f
i
x'
commit
|
commitdiff
|
tree
2014-09-11
Junio C
H
amano
Me
r
ge branch 'rs/child-
p
rocess-in
i
t'
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hamano
Merge branch 'jk/contri
b
-subtree-make
-
all'
commit
|
commitdiff
|
tree
2014-09-11
Junio
C Hamano
Merge branch 'ta/config-set-2'
commit
|
commitdiff
|
tree
2014-09-11
J
u
nio C H
a
mano
Merge b
r
anc
h
'ta/config-set
-
1'
commit
|
commitdiff
|
tree
2014-09-09
Ju
n
i
o
C Hamano
Update dra
f
t release notes
t
o 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-09
J
unio
C
H
aman
o
Me
r
ge branch
'sp/pack-prot
o
col-doc-on
-
shallow'
commit
|
commitdiff
|
tree
2014-09-09
J
unio
C
Ham
a
no
Merge branch
'tf/im
a
p
-send-create'
commit
|
commitdiff
|
tree
2014-09-09
Junio C
H
amano
M
e
rge
b
r
anch 'jk
/
prompt-stash-co
u
ld-be-
p
acked'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hama
n
o
Merge branch 'tb/pretty-format-cd-
d
ate-fo
r
mat'
commit
|
commitdiff
|
tree
2014-09-09
J
un
i
o C Hama
n
o
Merge branch 'r
s
/
inline-compat-path
-
m
a
cros'
commit
|
commitdiff
|
tree
2014-09-09
J
unio C H
a
ma
n
o
Merge branch 'rs
/
cle
a
n-menu-item-defn'
commit
|
commitdiff
|
tree
2014-09-09
Junio C H
a
mano
Merge b
r
a
nc
h
'jc/config-mak-documen
t
-
d
arwin-v
s
-macos
x
'
commit
|
commitdiff
|
tree
2014-09-09
J
unio C Hamano
Merge branch 'sb/
m
ail
s
pli
t
-dea
d
-code-removal'
commit
|
commitdiff
|
tree
2014-09-09
Junio
C
Hamano
Merge branch 'so/rebase-doc'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hamano
Merge branc
h
'sb/p
r
epare-revision-walk-er
r
o
r-c
h
eck'
commit
|
commitdiff
|
tree
2014-09-09
Junio C H
a
mano
Merge branc
h
'sb/
b
lame-ms
g
-i18n'
commit
|
commitdiff
|
tree
2014-09-09
Junio
C
H
a
mano
Merge branch 'n
d
/strbuf-utf
8
-replace'
commit
|
commitdiff
|
tree
2014-09-09
Juni
o
C Hamano
Merge branch 'sb/plug
-
l
eaks'
commit
|
commitdiff
|
tree
2014-09-09
J
u
nio
C Hama
n
o
M
erg
e
branch 'rs/refr
e
sh-beyond-symlink'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Ha
m
ano
Merge
branch 'la/init-do
c
'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Ham
a
n
o
Merge branch 'jk/stash-list-p'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hamano
M
e
r
ge
bran
c
h 'mm
/
l
o
g-bra
n
ch-desc-plug-leak'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hamano
M
erge bran
c
h 'lf/bundle-exclusion'
commit
|
commitdiff
|
tree
2014-09-09
Junio C H
a
ma
n
o
Merge br
a
nch 'jc
/
a
p
ply-ws-prefix'
commit
|
commitdiff
|
tree
2014-09-09
Juni
o
C Hamano
Merge branch 'jk/c
o
mmand-li
n
e-config-empty-string'
commit
|
commitdiff
|
tree
2014-09-09
Juni
o
C Hamano
M
e
r
ge bran
c
h
'bc/imap-send-doc'
commit
|
commitdiff
|
tree
2014-09-09
Jun
i
o C Hamano
Merge branch '
j
c/not-mingw-cygw
i
n'
commit
|
commitdiff
|
tree
2014-09-03
Ng
u
yễn
Thá
i
Ngọc
Duy
mv: no SP between function name and the first opening
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Nguyễ
n
T
hái Ngọc Du
y
m
v: comb
i
ne two if(s)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Nguyễn Thái Ngọc Duy
m
v:
u
nindent one level f
o
r direct
o
ry m
o
ve cod
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
N
g
u
y
ễ
n Thái Ngọc
D
uy
mv:
m
ove inde
x
search c
o
de o
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Ng
u
yễn Thái
N
gọc Duy
m
v
:
r
e
move
an "if" that's al
w
ays
t
rue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Nguyễn
Thái Ngọc Duy
mv: split
s
ubmo
d
u
l
e mo
v
e preparation code out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Junio
C
Hama
n
o
c
a
che-t
r
ee: d
o
not try t
o
us
e
an invalidated subt
r
ee
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Jonathan Nieder
update-ref
--stdi
n
:
p
as
s
transacti
o
n around explicitly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Jonathan Nied
e
r
update-ref
-
-stdi
n
: n
a
rrow sco
p
e of err strbuf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
R
onnie Sahlberg
refs
.
c: m
a
ke delete_ref
use a
t
ransaction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
R
o
nnie
Sahlberg
refs
.
c: make prune_ref use a tra
n
saction
to delete
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Ronnie S
a
hl
b
e
rg
r
efs
.
c: remove lock_ref_sha1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Ro
n
nie Sa
h
lberg
r
e
fs
.
c
: remo
v
e t
h
e u
p
date_
r
ef_wr
i
t
e
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Ronnie
Sa
h
lberg
refs
.
c: re
m
ove
t
h
e updat
e
_ref_lo
c
k f
u
nction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Ronnie Sahlberg
refs
.
c: make lock_r
e
f_sha1 st
a
tic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Ronnie Sah
l
ber
g
walker
.
c: use ref tran
s
action
f
or ref
upda
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Ronnie Sah
l
berg
fast
-
import
.
c: use a ref transaction when
dumping tags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Ronnie
S
ahl
b
erg
receive
-
pack
.
c
:
u
se a r
e
ference trans
a
ct
i
on
f
o
r upd
a
ting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Ronnie Sahlberg
refs
.
c:
ch
a
nge
u
p
d
a
te_ref to use a trans
a
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
R
onnie Sahlberg
b
r
a
nch
.
c: use ref transa
c
t
i
on for all ref upd
a
tes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Ronnie
S
ah
l
be
r
g
fas
t
-impo
r
t
.
c:
c
hange update_branch to u
s
e ref transacti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
R
o
n
nie Sa
h
lb
e
rg
s
e
quen
c
er
.
c
: use ref transactions f
o
r
all ref updates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Ronnie Sa
h
lberg
co
m
mit
.
c: use ref trans
a
ctions for updates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Ronni
e
Sahlberg
re
p
lace
.
c: us
e
the ref transac
t
ion f
u
nctio
n
s for updat
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Ro
n
n
ie S
a
hlbe
r
g
t
a
g
.
c: use r
e
f t
r
ansactions when doing upda
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
R
o
n
nie Sahlberg
refs
.
c: add
tr
a
nsaction
.
status and track OPEN/CLOSED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Ronnie
S
ahl
b
erg
refs
.
c: make
r
e
f_transaction_be
g
in take
a
n err
a
rgument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Ro
n
nie Sahlberg
refs
.
c: update r
e
f_t
r
ansaction_dele
t
e to
check for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-03
Ron
n
ie Sah
l
berg
refs
.
c: change
r
ef_trans
a
c
t
ion
_
create to do er
r
or checki
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-02
Junio C Ham
a
no
Start the post-2
.
1 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-02
J
unio C Hamano
Me
r
ge bra
n
ch 'rs/s
t
rbuf-getcwd'
commit
|
commitdiff
|
tree
2014-09-02
Junio C Hamano
Merge branch 'ta/pre
t
ty
-
pars
e
-config'
commit
|
commitdiff
|
tree
2014-09-02
J
unio C Hamano
Merge branch 'b
c
/archiv
e
-pax-heade
r
-mode'
commit
|
commitdiff
|
tree
2014-09-02
Jun
i
o
C
H
a
mano
Merge branch 'pr/re
m
o
tes-i
n
-ha
s
h
map'
commit
|
commitdiff
|
tree
2014-09-02
Junio
C Hamano
Merge branc
h
'jk/
p
retty-empty-format
'
commit
|
commitdiff
|
tree
2014-09-02
Jun
i
o C Hamano
M
e
r
ge branch 'ta/config-s
e
t'
commit
|
commitdiff
|
tree
2014-09-02
Junio C H
a
mano
Merge branch 'r
s
/i
n
it-no
-
duplicate-real-
p
ath'
commit
|
commitdiff
|
tree
2014-09-02
Junio C Hamano
Merge branch 'mm/con
f
ig-edit-global'
commit
|
commitdiff
|
tree
next