repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
apply: allow rerere() to work on --3way results
2012-07-09
J
un
i
o C Hamano
apply: allow rerere()
t
o wo
r
k on --3way re
s
ults
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
ap
p
ly:
register conf
l
icted stages to the
ind
e
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply: --
3
way with add/ad
d
co
n
flict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
a
pply
:
move verif
y
_in
d
ex_match() higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
app
l
y
:
plu
g
t
h
e thre
e
-way merge
l
ogic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ham
a
no
apply: fa
l
l back on
t
hree-w
a
y merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
a
pply
:
accept -3/--3
w
ay c
o
mmand
l
i
ne opt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
ama
n
o
apply: move "already exists
"
logic to check_to_create()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move c
h
eck_to_cr
e
ate_blob()
clos
e
r to its
s
ole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
a
p
p
ly:
f
urt
h
er split l
o
a
d
_preimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
a
p
ply: re
f
actor "pr
e
viou
s
p
atch"
lo
g
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Ham
a
no
apply: split load_preimage() helper f
u
nction out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: factor out c
h
eckout_target() helper function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ham
a
no
apply: refa
c
tor r
e
a
d
_
f
i
le_or_gitl
i
nk()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
ano
apply:
c
lear_im
a
ge
(
)
clears things a bit m
o
re
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Hamano
apply:
a bit more com
m
ents on PATH_T
O
_BE_DEL
E
TED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
ano
apply: fix an inco
m
plete
c
omment i
n
check_patch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
T
he ninth batch of
topi
c
s
graduated t
o
'master'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branch 'nh/empty-rebas
e
'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Ha
m
a
n
o
Mer
g
e branch
'z
j
/diff-empty-chmod'
commit
|
commitdiff
|
tree
2012-05-07
Juni
o
C
H
a
ma
n
o
Merg
e
branch 'jk/m
a
int-tfo
r
mat-with-z'
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o
C
Hama
n
o
Merge bra
n
ch 'th/difftool-diffall'
commit
|
commitdiff
|
tree
2012-05-07
J
u
nio C Hamano
Sync wit
h
maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hama
n
o
Start pre
p
aring
f
o
r 1
.
7
.
10
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
J
uni
o
C Hamano
Merge
b
r
anch 'jk/ma
i
n
t-gitweb-test-
u
se-sane-per
l
' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C H
a
m
an
o
Mer
g
e branc
h
'js/daemon-test-
r
ace-f
i
x
'
into maint
commit
|
commitdiff
|
tree
2012-05-07
J
unio C Ha
m
ano
Merge branch 'jk
/
m
a
int-config-bogus-section
'
into maint
commit
|
commitdiff
|
tree
2012-05-07
J
u
nio C
Ha
m
ano
Mer
g
e bran
c
h 'pw/t580
0
-
i
mport-
r
ac
e
-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2012-05-07
Junio
C Hamano
M
erge br
a
nch 'rt/cherry-revert
-
confl
i
ct-summ
a
ry'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hama
n
o
Mer
g
e branch
'cb/ma
i
n
t-report-m
o
unt-point-correctly
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Pe
t
e Wyc
k
off
git p4
d
oc: fix
for
m
attin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-04
Nguy
ễ
n Thái Ngọc Duy
M
akefi
l
e: kee
p
many
v
ariab
l
e l
i
st sorted
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-03
Neil Horman
git cherry-pick: do no
t
dere
f
e
rence a potential N
U
LL
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-03
Junio C
Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2012-05-03
Junio C H
a
m
ano
Merge b
r
a
nch 'jc/merge-reduce-parents-early'
i
nto maint
commit
|
commitdiff
|
tree
2012-05-03
Jun
i
o C
Hamano
Merge bran
c
h 'cb/
c
herry-pick-rev-path-c
o
nf
u
s
i
on' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
unio C Hamano
Merge b
r
anc
h
'cb/http-multi-curl-auth' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2012-05-03
Junio C
H
amano
Me
r
ge bra
n
ch
'mb/fetch-
c
a
l
l-
a
-
n
on-branch-a-
r
ef' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
Hamano
Merg
e
branch 'r
l
/
maint-stash-
i
1
8
n
-save-e
r
ror' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Juni
o
C Hamano
Merg
e
br
a
nch 'jm/
m
aint-s
t
rncp
y
-diff-
n
o-index' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io
C
H
amano
Merg
e
branch 'jk/maint-push
-
progress'
commit
|
commitdiff
|
tree
2012-05-03
Junio
C Ha
m
a
n
o
Merge br
a
n
c
h 'n
d
/columns'
commit
|
commitdiff
|
tree
2012-05-03
Jeff King
doc/config: fix inl
i
ne literals
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
The eighth
ba
t
ch
of topics graduate
d
to 'master
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
erge branch
'mas
t
er' of
g
i
t:
/
/git
.
bogomips
.
or
g
/
g
i
t-svn
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge
branch 'tr/xd
i
ff-
f
ast-hash'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hama
n
o
M
e
rge
b
ra
n
ch 'jk/maint-gitweb-tes
t
-use
-
sane-perl'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ha
m
ano
M
erge branch 'pw/messag
e
-clean
u
p'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
e
rge bran
c
h 'z
j
/dif
f
-stat-smaller-num-co
l
umns'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Hamano
Merge branch 'pw/p4-
v
arious'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
no
Me
r
ge br
a
nch 'jc/rer
e
re-train'
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o
C
H
a
mano
Mer
g
e branch
'
ab/i18n'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
M
erge branch 'l
p
/diffstat-wit
h
-
g
r
aph'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
i
o
C
H
a
m
ano
M
erge b
r
anch
'zj/m
k
s
h
-column
s
-breakage'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branc
h
'
j
k/
d
oc-asciid
o
c-inline-li
t
eral
'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Haman
o
Mer
g
e
b
ra
n
ch 'nd/i18n'
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
mano
Merge branc
h
'mm/si
m
ple-push
'
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C Hamano
Merge branch 'jc/index
-
v4'
commit
|
commitdiff
|
tree
2012-05-02
Johannes Six
t
t
4
0
06: Windows do
n
ot
have /d
e
v/zero
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Zb
i
gniew Jędrze
j
ews
k
.
.
.
d
iff --stat: do
not r
u
n diff on indenti
c
al files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Zbigni
e
w Jęd
r
zejewsk
.
.
.
diff --s
t
at: report mod
e
-onl
y
changes for binary file
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
amano
Mer
g
e
branch
'master
'
of
h
ttps://gi
t
hub
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Hamano
Sync wit
h
v1
.
7
.
1
0
.
1
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Git 1
.
7
.
10
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C Hamano
Merge bra
n
ch 'pw
/
f
ast-
i
mp
o
r
t
-d
a
taref-par
s
ing' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C Hamano
Me
r
ge branch 'it/fetch
-
pack-
m
any-re
f
s' in
t
o main
t
commit
|
commitdiff
|
tree
2012-05-02
J
unio C H
a
mano
Merge b
r
anch 'jl/m
a
int-submodule-re
c
u
rse-fetch' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C
Hamano
M
erge branch 'jc/main
t
-blame
-
minimal' int
o
m
a
in
t
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
M
e
r
ge b
r
anch 'lp/m
a
int-diff-three-dash-with
-
g
rap
h
'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
unio
C Ha
m
a
n
o
M
erge
b
r
anc
h
'jk/rebase-i-submodule-conflict-on
l
y'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge
branch 'maint' of https
:
//gith
u
b
.
co
m
/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Zbigniew Jędr
z
ejewsk
.
.
.
Consistently use perl f
r
om /usr/bin/ for scripts
Suggested-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Thomas
R
a
s
t
xdi
f
f: cho
o
se XDL_FAST_HASH c
o
d
e
on sizeof(long) inst
e
ad
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
J
eff King
t/gitwe
b
-
l
ib: use $PERL_PATH t
o
run g
i
tweb
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Zb
i
gniew Jędrzej
e
wsk
.
.
.
t
e
s
t
s
: check --[short]stat out
p
u
t
a
fte
r
c
hmod
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Zbi
g
niew Ję
d
rzejewsk
.
.
.
test: modernize style of
t
4006
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Ju
n
io C Ham
a
no
log
-
tree: the previous o
n
e is still not quite ri
g
ht
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jan Kr
ü
ge
r
log-tre
e
: use custom line terminato
r
in line term
i
n
a
tio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
J
e
ff King
t5541: test more combinat
i
ons
o
f
--progress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
J
e
ff Ki
n
g
t
e
ach send-pac
k
about --[no-]
p
rogress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
J
e
ff King
send-pac
k
: show pr
o
gre
s
s
when is
a
tty(2)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
gi
t
p4: submit fil
e
s with wi
l
dcards
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wycko
f
f
git p4:
fi
x
writabl
e
file af
t
e
r
rename
or copy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
git p4: test
s
u
b
mit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
g
i
t
p4
:
br
i
ng ba
c
k files in
deleted clien
t
direct
o
ry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pe
t
e Wycko
f
f
remove blank filename in error mess
a
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
P
e
te Wyckoff
remove superfluous newlines
in
e
rr
o
r messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Junio
C
H
a
mano
Merge bra
n
ch
'ld/
g
it
-
p4-tags-and-labels'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge br
a
nch 'nh
/
e
m
pty
-
reba
s
e
'
commit
|
commitdiff
|
tree
2012-04-30
Junio C
H
amano
Mer
g
e branch
'
jk/mai
n
t-config-bogus-section
'
commit
|
commitdiff
|
tree
2012-04-30
Zbi
g
ni
e
w Ję
d
r
zejewsk
.
.
.
diff --
s
tat: use less c
o
lumns for
chan
g
e
counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Juni
o
C Hamano
contrib/re
r
ere-tra
i
n: use inst
a
lled git-sh-s
e
tu
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Æ
var
Arnf
j
örð
Bjar
m
ason
git-comm
i
t: rem
o
ve lego in i18
n
m
e
ssages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Æv
a
r Arnfjör
ð
Bjarmason
gi
t
-commit: remove lego in i18n messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Ævar Arn
f
j
ö
rð
B
jarmason
gi
t
-br
a
nch: remove lego
i
n
i
18n me
s
sages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
The se
v
e
nth bat
c
h
of t
o
pics graduat
e
d to 'master'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Me
r
ge bran
c
h
'
j
s
/
dae
m
on-
t
est-race-fix'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge b
r
anch 'kk/
g
itweb-omit-expensive'
commit
|
commitdiff
|
tree
2012-04-30
Junio
C
Hamano
Merge b
r
anch 'kk/maint
-
gitweb-missing-
o
wner'
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio
C H
a
mano
Merge
branch 'rs/commit-
l
i
st-append'
commit
|
commitdiff
|
tree
next