repo.or.cz
/
git
/
gitweb.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
u
n
io C Hamano
appl
y
: allow
r
e
rere() to work on --3way resu
l
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: register conflicted sta
g
es to th
e
index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
ama
n
o
ap
p
ly
:
--3way with add/
a
dd confli
c
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply
:
move
v
erify_index_m
a
tch() hi
g
her
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Haman
o
a
p
p
ly: plug the three-way merge
logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly:
f
all back on three-w
a
y merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: accept
-
3/
-
-3w
a
y command line option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply:
m
ove "al
r
eady
e
xists" l
o
gic
t
o
che
c
k
_
t
o
_create()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Ham
a
no
apply: mo
v
e ch
e
ck_to_create_blob() closer to its
s
ole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
n
o
apply: further spli
t
load_pre
i
mage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
Hamano
appl
y
:
refactor "previous patch" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply:
s
plit loa
d
_prei
m
age() helper fu
n
c
t
ion
ou
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: fa
c
tor out checkou
t
_target() hel
p
er func
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
p
ly: refactor r
e
ad_file_or_gitlink
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Ha
m
ano
ap
p
ly: clear_i
m
age()
cle
a
rs t
h
ing
s
a bit more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io
C
Hamano
apply
:
a
b
i
t
more comments on PATH_TO_
B
E
_DELETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C H
a
man
o
apply: fix an incomplete comme
n
t in c
h
e
c
k_patch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
The nint
h
batc
h
of t
o
pics g
r
aduated to
'
master'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Junio
C
Hamano
Merge br
a
nch 'nh/
e
mpty-rebase'
commit
|
commitdiff
|
tree
2012-05-07
J
u
nio C
Hamano
M
erge br
a
n
ch 'zj/
d
iff-empt
y
-chmod'
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o C Ha
m
a
no
Merge
branch 'jk/main
t
-t
f
o
r
mat-
w
ith-z'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
M
e
rge branch 'th
/
difftool-dif
f
a
ll'
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o C Hamano
Sync with
maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C
H
amano
Start pr
e
paring for 1
.
7
.
1
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
M
erge branch '
j
k/maint
-
gitweb-test-use-sane-perl' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C H
a
mano
Merg
e
branch 'js/da
e
mon-test-race-fix'
into maint
commit
|
commitdiff
|
tree
2012-05-07
Junio
C Hamano
Merge branch 'jk/maint-config-bogus-
s
e
ction' into
main
t
commit
|
commitdiff
|
tree
2012-05-07
J
unio C
Hamano
Merge
b
ranch 'pw/t5800-import-ra
c
e
-
f
ix'
into maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge br
a
n
ch 'rt/cherry-revert-con
f
lict-summary' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
i
o C
Hamano
Merge branch 'cb/mai
n
t-report
-
mount-point-c
o
r
r
ectly
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Pete
W
yckoff
g
i
t
p4 do
c
:
f
ix form
a
tting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-04
Nguyễn T
h
ái Ngọc
Duy
Mak
e
file
:
k
ee
p
many variable list so
r
te
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-03
Neil Horman
git che
r
ry-pick: do not dereferenc
e
a
pote
n
t
ial NULL
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-03
Junio
C H
a
mano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2012-05-03
Junio C H
a
mano
Mer
g
e b
r
anch 'jc/merge-reduce-parents
-
early' into m
a
int
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
Hamano
Merge branch 'cb/cherry-pi
c
k-rev-path-confusion' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
un
i
o C Hamano
M
erge branch 'cb/http-multi-curl-auth' int
o
m
a
int
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hama
n
o
Merge branch
'
mb/f
e
tc
h
-
c
all-a-n
o
n-branc
h
-a-ref
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Ham
a
no
Merge b
r
anch 'rl/maint-
s
tash-i18n
-
sav
e
-error
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merg
e
branch '
j
m
/
m
aint-strn
c
py-
d
iff-
n
o-index
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C H
a
ma
n
o
Mer
g
e
br
a
nch 'jk/maint-pu
s
h
-progress'
commit
|
commitdiff
|
tree
2012-05-03
Junio C H
a
mano
M
erge branch
'
nd/
c
olumns'
commit
|
commitdiff
|
tree
2012-05-03
Je
f
f K
i
ng
doc/
c
onf
i
g: fi
x
inline literals
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
The eighth batc
h
of
t
opics graduated
to 'm
a
ste
r
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio C
Ha
m
ano
Merge bra
n
ch 'ma
s
ter' o
f
git://git
.
bogomips
.
org/git-sv
n
commit
|
commitdiff
|
tree
2012-05-02
J
unio
C
H
am
a
no
Merge branch '
t
r/xdiff-fast-h
a
sh'
commit
|
commitdiff
|
tree
2012-05-02
J
u
n
io C Hamano
Merge bran
c
h
'jk/maint
-
gitweb-test-use-sane-perl'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Haman
o
Merge
b
r
a
n
ch 'pw/message-clea
n
up'
commit
|
commitdiff
|
tree
2012-05-02
J
unio C Hamano
Me
r
g
e bra
n
ch
'
zj/diff-stat-sma
l
ler-num-c
o
lu
m
ns'
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C
H
amano
Me
r
ge
b
ranch 'pw/p
4
-various
'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Haman
o
M
erge branch
'
jc/rerere
-
train'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Mer
g
e
b
ranch 'ab/i
1
8n'
commit
|
commitdiff
|
tree
2012-05-02
J
unio
C
Ham
a
no
Merg
e
b
r
anch 'lp/diffstat
-
with-graph'
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C Hamano
Me
r
g
e branch '
z
j/mksh-colum
n
s
-
breakage'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Hamano
Merge branch 'jk/doc-a
s
ciidoc-inline-lit
e
r
a
l'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C
H
ama
n
o
M
erge
b
ranch
'nd/i18n'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
no
Merge branch 'm
m
/si
m
ple-push'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hama
n
o
Mer
g
e branch 'jc/index-v4'
commit
|
commitdiff
|
tree
2012-05-02
Johanne
s
Sixt
t4
0
0
6
: Windows do no
t
have
/dev/zero
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Zbigniew
J
ę
drzeje
w
s
k
.
.
.
diff
-
-st
a
t
:
do not run diff
on indent
i
cal f
i
les
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Zb
i
gniew Jędrzejews
k
.
.
.
diff --stat: r
e
port mode-
o
nly ch
a
nges for bina
r
y fi
l
es
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Mer
g
e b
r
anch 'master' of https:/
/
github
.
com/git-l
1
0n
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Hamano
Sync with v1
.
7
.
10
.
1
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C
H
amano
G
i
t 1
.
7
.
1
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch
'
pw/
f
ast-imp
o
r
t
-
dataref-parsing' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io
C
Hamano
Merge
b
ranch
'
it/fetch-pac
k
-man
y
-refs' into maint
commit
|
commitdiff
|
tree
2012-05-02
Junio C
Hamano
Merge br
a
nch 'jl/maint-s
u
bmodule
-
r
ecurse
-
fetch' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
un
i
o C Ham
a
no
Mer
g
e
bran
c
h '
j
c/maint-b
l
ame-m
i
nimal' into maint
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
no
Merge bra
n
ch 'lp/maint-diff-three-dash-wit
h
-graph'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C Hamano
Merg
e
b
r
anch 'jk/reba
s
e-i-submodule-conflict-onl
y
'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
H
a
mano
Mer
g
e branch 'maint' o
f
h
t
tps://github
.
c
om/
g
it-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Zbigniew Jędrzejew
s
k
.
.
.
Consi
s
tent
l
y
use
p
e
r
l
from /usr/bin/ for
s
cripts
Suggested-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Thomas Rast
x
d
iff: choose
XDL_FAST_HASH
c
ode on sizeof(long
)
inste
a
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jeff Kin
g
t
/gitwe
b
-
l
ib:
u
se
$
P
ERL
_
PATH to run git
w
eb
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Z
bigniew Jędrzeje
w
sk
.
.
.
tests: check -
-
[
sh
o
rt]stat
o
utput af
t
er chmod
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Zbig
n
i
e
w J
ę
dr
z
e
jewsk
.
.
.
t
est: moder
n
i
ze
s
tyle of
t4006
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
J
u
n
i
o C Hamano
log-tree: the previous one is still not quite
r
ight
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jan Krü
g
er
lo
g
-tree: use custom line t
e
r
m
inator i
n
line term
i
nat
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jeff King
t5541: te
s
t
m
o
re combinat
i
ons of
-
-progre
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jef
f
Ki
n
g
teach send-pack abo
u
t
-
-[no-]progres
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jeff King
send-pack
:
s
h
o
w progress when i
s
atty(2)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pe
t
e
Wyckof
f
git
p4: submi
t
files
with wil
d
c
a
rds
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
gi
t
p
4
: fix wr
i
table file af
t
er ren
a
m
e
o
r c
o
py
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
git
p
4: test subm
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyc
k
off
git
p4:
b
ring b
a
c
k file
s
in de
l
eted client d
i
r
e
ctory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
remove bla
n
k fi
l
en
a
m
e
in error messa
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete
W
yckoff
remove super
f
luous
newlines in error messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Jun
i
o C Ha
m
ano
M
e
rge bra
n
ch 'ld/g
i
t-p
4
-
t
ags
-
and-
l
abe
l
s'
commit
|
commitdiff
|
tree
2012-04-30
J
u
ni
o
C Hama
n
o
Merge
branch 'nh/empty-rebase'
commit
|
commitdiff
|
tree
2012-04-30
Junio C H
a
mano
Merge branch 'jk/mai
n
t-c
o
nfig-bogus-section'
commit
|
commitdiff
|
tree
2012-04-30
Zbigniew J
ę
d
r
zejewsk
.
.
.
diff --stat: use le
s
s
column
s
f
o
r change counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Junio C Ha
m
ano
contrib/rerere-train: use installed git-
s
h
-
set
u
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Ævar Arn
f
jörð Bjarmason
git-comm
i
t: re
m
ove
l
ego in i18n messag
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Ævar
A
rnfjörð Bjarmason
g
it-co
m
mit: rem
o
ve lego in
i18
n
messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Æva
r
Arnfjörð Bjarmason
git-branch: remove le
g
o in i18n messa
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
J
uni
o
C
H
a
mano
T
he
s
eventh batch of topics graduated to
'
ma
s
ter'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Juni
o
C
Hamano
Me
r
g
e
branch 'js/daemon
-
test-race-fix
'
commit
|
commitdiff
|
tree
2012-04-30
Junio
C
Hamano
Merge branc
h
'kk/gitweb-omit-expen
s
ive
'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge branch 'kk/main
t
-git
w
e
b-missi
n
g-own
e
r'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Ha
m
ano
Merge
branch '
r
s/
c
ommit-list-
a
ppend'
commit
|
commitdiff
|
tree
next