repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
apply: tests for the --3way option
2012-07-10
Junio
C Hamano
apply:
t
ests for the --3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Hamano
apply: document --3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply: allow rere
r
e() to
w
or
k
on --3way resul
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply:
regis
t
er confl
i
cted stages to the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply: --3
w
ay
w
it
h
add/add conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
ap
p
ly:
m
ove
ver
i
fy_index_match() higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: plug the three-way me
r
ge logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
ap
p
l
y: fall b
a
ck on three-way merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: ac
c
ept -3
/
--3wa
y
co
m
mand li
n
e optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ham
a
n
o
a
pp
l
y
: move "a
l
ready
e
xists" logic to c
h
eck_to_create()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C H
a
mano
apply:
m
ove che
c
k_to_c
r
eate_blob() clos
e
r to i
t
s
s
o
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Ha
m
an
o
apply: furth
e
r split l
o
ad_preimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
refactor "pr
e
vi
o
us
patc
h
" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply:
s
plit load_preim
a
g
e
()
h
e
lper function out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
appl
y
:
fa
c
t
or out
checkout_targe
t
() helper function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Haman
o
apply:
r
efactor read_file_or_git
l
ink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C
H
amano
apply: clear_image() clears things a bit more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Hamano
appl
y
:
a bit more comm
e
nts on PA
T
H_
T
O
_B
E
_DELETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
a
p
ply: fix an incomple
t
e comment in
c
hec
k
_patch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
J
u
n
i
o C
Hamano
The ninth batch of
topics graduated 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/empty-rebase'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branch 'zj/diff-empt
y
-chmod'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hama
n
o
Merge branch
'
jk/m
a
int-
t
f
o
rmat-
w
i
t
h-
z
'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Ham
a
n
o
M
e
r
g
e br
a
nch 'th/d
i
fftoo
l
-diff
a
ll'
commit
|
commitdiff
|
tree
2012-05-07
J
unio C Hama
n
o
Syn
c
with ma
i
nt
commit
|
commitdiff
|
tree
2012-05-07
Junio C
H
amano
S
tart
p
reparing f
o
r
1
.
7
.
10
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
i
o C Ham
a
no
Me
r
ge branch 'jk
/
maint-gitweb-test-us
e
-sane
-
perl' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge br
a
nch 'js/daemon-test-r
a
ce-fix' i
n
to maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branch 'jk/m
a
in
t
-
c
onfig
-
bogus-section'
i
nto m
a
int
commit
|
commitdiff
|
tree
2012-05-07
J
unio
C
Hama
n
o
Me
r
ge branch
'pw/t5800-import-race-fix'
i
nto maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branc
h
'rt
/
cher
r
y-r
e
vert-conflict-
s
u
mmary'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Ha
m
ano
Merge b
r
anch 'cb/maint-report-mount-
p
oint-co
r
rectly
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Pete Wyckoff
g
i
t
p
4
d
oc: fix formatti
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-04
N
guyễn Thái
Ngọc Duy
Makefile:
keep many variable list sorted
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-03
Ne
i
l H
o
rman
git cher
r
y-
p
i
c
k
:
do not dereference a po
t
ential NULL
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-03
J
u
nio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
Hamano
Merge bran
c
h 'jc/merge-reduce-parents
-
ea
r
l
y
' into ma
i
nt
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge br
a
nch 'cb/c
h
erry-pick-rev-path-conf
u
s
i
on' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
u
nio C Ham
a
no
M
erg
e
b
ranch 'cb/h
t
tp-mu
l
t
i
-curl-auth'
into maint
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io C Hamano
Merge branch 'mb/fetch-call-a
-
non-branch-a-ref' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Jun
i
o
C
Hama
n
o
Merge branch 'rl/main
t
-stash-i18n-save-error'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio
C Hamano
Merge b
r
anch 'jm/maint-st
r
ncpy-d
i
ff-no-ind
e
x' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
unio C Hamano
Merge
b
ranch 'jk/maint-push-pr
o
g
r
ess'
commit
|
commitdiff
|
tree
2012-05-03
Junio C
H
a
mano
Merge
br
a
nch 'nd/
c
olumns'
commit
|
commitdiff
|
tree
2012-05-03
Jeff King
doc
/
conf
i
g: fix
inline l
i
te
r
als
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Ha
m
ano
The eighth batch of to
p
ics
gra
d
uated to 'master'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'master' of git://git
.
bogomip
s
.
org/git-svn
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
no
Merge
branch 'tr
/
xdiff-fa
s
t-
h
ash'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch '
j
k
/
maint-gitweb-test-use-sane-
p
erl'
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
mano
Merge branch 'pw/mess
a
ge-cleanup
'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
e
rge
b
ranch '
z
j/diff-stat-small
e
r-num-colu
m
ns'
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
amano
Merge branch 'pw/p4-various'
commit
|
commitdiff
|
tree
2012-05-02
J
un
i
o C Hamano
Mer
g
e b
r
anch 'jc/rerere-train'
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C Hamano
M
e
rge branch 'ab/i18n'
commit
|
commitdiff
|
tree
2012-05-02
J
unio
C
Hamano
Merge branch 'lp/diffstat-wi
t
h-graph'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
M
e
r
ge bra
n
ch 'zj/mks
h
-
c
olu
m
n
s-breaka
g
e'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge b
r
a
n
ch
'jk/d
o
c-asci
i
doc-inlin
e
-liter
a
l'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io
C Hamano
Me
r
ge
branch 'nd/i18n'
commit
|
commitdiff
|
tree
2012-05-02
J
u
n
io C Hamano
Merge branch 'mm/simple-push'
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C Hamano
Mer
g
e branch '
j
c/index-v4'
commit
|
commitdiff
|
tree
2012-05-02
J
ohannes Sixt
t
4
006: Windows
d
o
not hav
e
/dev/zero
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Zbigniew Jędrzejewsk
.
.
.
diff --sta
t
: do not run
diff on indentica
l
files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Zbign
i
ew
Jędrzejewsk
.
.
.
d
i
ff --st
a
t: report
m
ode-on
l
y changes for binary fil
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C Ham
a
n
o
Merge branch 'maste
r
'
of
htt
p
s
:
//g
i
t
h
u
b
.
co
m
/
g
it-l10
n
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
S
ync
with v
1
.
7
.
10
.
1
commit
|
commitdiff
|
tree
2012-05-02
J
u
ni
o
C
H
amano
Git 1
.
7
.
1
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C
Ha
m
ano
Merge branch 'p
w
/fa
s
t-i
m
port-da
t
ar
e
f-pa
r
sin
g
' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
e
rge branch
'i
t
/fetch-pack-many-refs' into main
t
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Hamano
Mer
g
e
branch 'jl
/
ma
i
n
t-submod
u
le-re
c
urs
e
-fetch' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Hamano
Merge bra
n
ch 'jc/mai
n
t-bl
a
me-mini
m
al'
into maint
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hama
n
o
Merge branch
'l
p
/maint-
d
iff-three-da
s
h-w
i
th-graph'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
m
a
no
M
e
rge b
r
a
nch
'
jk/re
b
ase-i-submodule-conflict-
o
nly
'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
amano
Merge branch 'maint' of https://github
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Zbigni
e
w Jędrzeje
w
s
k
.
.
.
Consistently use perl from /us
r
/
b
in/ for scr
i
pts
Suggested-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Thoma
s
Rast
xdiff
:
choose XDL
_
FAST
_
H
ASH co
d
e on
sizeof(long) instead
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jeff
K
i
ng
t/gi
t
web-
l
ib
:
use $PERL_PATH
to run gitweb
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Zbigniew Jędrz
e
jewsk
.
.
.
te
s
ts:
chec
k
--[short]stat output af
t
e
r chmod
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Zb
i
g
niew Ję
d
rz
e
jew
s
k
.
.
.
test:
m
oder
n
ize
style o
f
t4006
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Junio C Hamano
log-tree: the previous one is st
i
ll not quit
e
r
ight
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jan K
r
üger
log-tree
:
u
se custom
line
te
r
m
i
nator in line termi
n
ation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jeff
K
i
n
g
t5541: tes
t
mor
e
combina
t
ions of --progres
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jeff
K
ing
teach send-pack about
-
-[no-]progres
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
J
e
ff K
i
ng
send
-
pack: show progress when isatty(2)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
P
ete Wyckoff
gi
t
p4: submit files w
i
th wi
l
dcards
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete
Wy
c
koff
git p4: fix writable file aft
e
r rename or copy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete
Wyckof
f
git p
4
: te
s
t
s
u
bmit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete W
y
c
k
off
git p4: bring back files in
d
elete
d
client dir
e
ctory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
P
e
t
e Wyckoff
remove
blank
f
i
lename in er
r
or mess
a
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
P
et
e
Wyckoff
r
e
m
o
ve s
u
perflu
o
us newlines in error
m
essa
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Junio C
Hamano
Merge branch 'ld/gi
t
-p4-tag
s
-a
n
d-l
a
bels'
commit
|
commitdiff
|
tree
2012-04-30
Juni
o
C
Ha
m
ano
Merge branch 'nh/empty-re
b
ase'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge branc
h
'jk/maint-config-bog
u
s
-
sect
i
on'
commit
|
commitdiff
|
tree
2012-04-30
Zbigniew Jęd
r
zejewsk
.
.
.
d
iff --stat: use less column
s
f
or change counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Juni
o
C Hama
n
o
contri
b
/rere
r
e-t
r
ain: use i
n
stalled git-sh-setup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Ævar Arnfjörð
B
jarmason
g
i
t-commit:
remove lego i
n
i1
8
n
mes
s
a
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Ævar Arn
f
jörð Bja
r
maso
n
git-co
m
m
i
t: remove le
g
o in i18n m
e
ssages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Æ
var A
r
nfjörð Bjarmason
git-branch: remov
e
l
e
go in i18n m
e
ssages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Ju
n
io C
Hamano
The sevent
h
b
atc
h
of top
i
cs graduated
to 'ma
s
ter'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
J
unio C Ham
a
no
Merge bran
c
h 'js/
d
aemon
-
test-race-fix'
commit
|
commitdiff
|
tree
2012-04-30
Junio
C Ha
m
ano
Merge b
r
anch 'kk/gitweb-omi
t
-expensi
v
e'
commit
|
commitdiff
|
tree
next