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: accept -3/--3way command line option
2012-07-09
Junio C
H
amano
a
p
ply: accept -3/--3way command l
i
ne opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
amano
apply: m
o
v
e "alr
e
ady exis
t
s" logic to check_to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C H
a
mano
apply: mo
v
e check_t
o
_create_blob()
c
loser to
i
ts s
o
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
p
l
y:
f
urther split
l
oad_preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pply:
refactor "
p
reviou
s
patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: sp
l
it load_preimage() he
l
pe
r
funct
i
on out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: factor
o
u
t
ch
e
ckout_target
(
) helper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Ham
a
no
apply: refactor read_file_or_git
l
ink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
app
l
y
: clear_image() clears things
a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pp
l
y
:
a bit
m
o
r
e
c
o
mments on PATH_TO_BE
_
D
ELETE
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Hamano
app
l
y: f
i
x an incomplete co
m
ment
i
n chec
k
_p
a
tch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
J
u
nio C Ha
m
ano
The
ninth batch
of topics gra
d
uated to
'
master'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Junio C H
a
mano
Mer
g
e br
a
nch 'nh/empty-rebase'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Ham
a
no
Merge b
r
a
n
ch 'zj/di
f
f-empty-chmod'
commit
|
commitdiff
|
tree
2012-05-07
Junio C
H
aman
o
Merge br
a
nch 'jk/maint-
t
f
o
rmat-
w
ith-z'
By Jan Krüger (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-07
J
u
n
i
o
C
Hamano
Merge
branch 'th
/
diff
t
ool-diffall'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Sync with main
t
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io C Hamano
S
t
art preparing
f
or 1
.
7
.
10
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
J
u
n
io C Ham
a
no
Merge branch 'jk/maint-gitweb-
t
est-use-sane-perl'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
J
u
nio C Hamano
M
e
rge branch 'js/daemon-test-race-fix' into main
t
commit
|
commitdiff
|
tree
2012-05-07
Junio C Haman
o
Merge b
r
anch 'jk/m
a
int-conf
i
g-bog
u
s-se
c
tion' into ma
i
nt
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge bran
c
h 'pw
/
t5800-import-race
-
fix' into main
t
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branch 'r
t
/
c
herry-
r
evert
-
conflict-summary' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio
C
Hamano
Merge branch '
c
b/maint-report-mount-point-cor
r
ectly
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Pete
Wyckoff
g
i
t
p4 doc: fix formatting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-04
Nguy
ễ
n
Thái Ngọc Du
y
Makef
i
le
:
k
eep many variable lis
t
sorted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-03
Neil H
o
rman
g
i
t cherry-pic
k
: do not dere
f
er
e
nce a potential NULL
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-03
J
u
n
i
o C H
a
mano
Merge branch
'maint
'
commit
|
commitdiff
|
tree
2012-05-03
Juni
o
C
Hamano
Merge branch '
j
c/merge-
r
edu
c
e-
p
are
n
ts-early' into ma
i
nt
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-05-03
Junio C Ha
m
ano
Merge bra
n
ch 'cb/cherry-
p
ick-re
v
-p
a
th-confusion'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io C
H
ama
n
o
Merge
b
ranc
h
'cb/http-
m
u
lt
i
-cu
r
l-au
t
h
'
into
m
aint
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Me
r
ge branch 'mb/fetch-call-a-non-bran
c
h-a-
r
ef' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge branch 'rl/maint
-
s
t
ash-i18n-save-e
r
ror'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge br
a
nch
'jm/maint-strnc
p
y-diff-no-i
n
dex' into
.
.
.
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-03
Junio C Ha
m
a
no
Merge branch 'jk/mai
n
t
-
push-progress'
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge bran
c
h
'nd/columns'
commit
|
commitdiff
|
tree
2012-05-03
J
e
ff K
i
ng
d
o
c/config: fix
i
nlin
e
liter
a
ls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
H
a
mano
Th
e
ei
g
hth batc
h
of topics graduated t
o
'master'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
i
o C Ham
a
no
Merge b
r
anch 'm
a
ster' of git
:
//git
.
b
o
gomips
.
or
g
/git-svn
commit
|
commitdiff
|
tree
2012-05-02
Junio C
Hamano
Merge branch
'
t
r
/xdif
f
-
f
a
s
t-hash'
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
amano
Merge branch 'jk/maint-gitweb-test-use-sane-
p
erl'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'p
w
/message-cleanup'
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
am
a
no
Merg
e
branch 'zj/diff-stat-smaller-num-c
o
lumns
'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
erge bra
n
ch 'pw
/
p4-vari
o
us'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Hamano
M
erge br
a
nch
'
jc/r
e
rere-train
'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Hamano
Merge
branch 'ab/i18n'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
erg
e
branch 'lp/diffstat-
w
ith
-
graph'
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C Hamano
Merge branch 'zj/mksh-columns-b
r
ea
k
age'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ha
m
ano
Merge branch 'jk/doc-asciidoc-inline
-
literal'
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C Hamano
Merge branch
'
nd/i
1
8
n'
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C
H
ama
n
o
Merge br
a
nch '
m
m/simple-push
'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
e
rge branch '
j
c/index-v4'
commit
|
commitdiff
|
tree
2012-05-02
Jo
h
annes Sixt
t40
0
6: Windows do
not ha
v
e /dev/ze
r
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Zbignie
w
J
ędrzejewsk
.
.
.
di
f
f
--
s
tat: do not
r
un di
f
f on inden
t
ica
l
files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Zbignie
w
Jędrzejewsk
.
.
.
diff -
-
s
t
at
:
report mode-on
l
y chan
g
es for bin
a
ry files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Haman
o
Merge branch 'master' of ht
t
p
s
:
//github
.
c
o
m/git
-
l1
0
n
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Sync
with v1
.
7
.
1
0
.
1
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Git 1
.
7
.
1
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
H
a
mano
Merge branch
'
p
w
/fast-i
m
por
t
-dat
a
ref-par
s
ing' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
no
Me
r
ge branch 'it/fetch-pack-ma
n
y-ref
s
' int
o
maint
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
Merg
e
br
a
nch 'j
l
/maint-submodule-recurs
e
-fetch' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
unio
C Hamano
Merge bran
c
h 'jc/maint-blam
e
-mini
m
a
l
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'lp/maint-diff-three-dash-with-
g
r
a
ph'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Ham
a
no
M
e
rge br
a
nch 'j
k
/rebase-
i
-s
u
bmodule-conflict-
o
nl
y
'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
i
o
C Hamano
M
e
rge branch
'
mai
n
t' of
ht
t
ps://github
.
com
/
git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Zbignie
w
Ję
d
rzejewsk
.
.
.
Consist
e
nt
l
y
use perl from /us
r
/
b
in/ for
s
c
ripts
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
xdiff
:
choose XDL_FAST_HASH code
o
n sizeof(long) instead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
J
eff King
t/
g
itweb-lib: use $PERL_PATH to run gitwe
b
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Zbigni
e
w Jędrzejewsk
.
.
.
tests: che
c
k --[short]stat out
p
ut after ch
m
od
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Zb
i
gnie
w
Jędrzejewsk
.
.
.
tes
t
: modern
i
ze style of t40
0
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
J
u
nio C Ha
m
an
o
log-tree:
t
h
e
pr
e
vious one
i
s still not quite right
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
J
a
n Krüger
log-tree: use custom
l
i
n
e
terminato
r
in line ter
m
inati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Je
f
f
K
ing
t
5541: tes
t
m
ore combina
t
ions of --p
r
ogre
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Jeff Ki
n
g
teach send-pack about --[no-]progress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Jeff King
send-p
a
ck
:
s
h
ow progress when isatty(2)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete W
y
c
k
off
g
i
t
p
4: submit files w
i
t
h
wi
l
dcards
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete
W
yckoff
gi
t
p4:
f
i
x
writable fil
e
after rename or
co
p
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
P
e
te Wy
c
koff
git p4: test sub
m
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wycko
f
f
git p
4
: bring
b
ack files in deleted clie
n
t direct
o
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wy
c
k
o
ff
remove bl
a
nk fi
l
ename in error mess
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete W
y
ckoff
remove super
f
luous newlines in error mess
a
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge branch '
l
d/git-p4-tags
-
and-label
s
'
commit
|
commitdiff
|
tree
2012-04-30
Junio C
Haman
o
Merge
b
ranch
'
nh/
e
mpty-re
b
ase'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge
b
r
anch 'jk/ma
i
nt
-
config-bogus-section'
commit
|
commitdiff
|
tree
2012-04-30
Zbign
i
ew Jędrzejewsk
.
.
.
diff --s
t
at: use less column
s
fo
r
change counts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Jun
i
o C Hamano
contri
b
/rere
r
e-t
r
ain: use insta
l
l
ed git
-
sh-setu
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Ævar Arnfjörð Bjarmaso
n
git-commit:
r
emove leg
o
in
i
18n
m
essages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Æva
r
A
r
nfjörð Bjarmason
git-commit: remove lego in i18n messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Æva
r
Arnfjörð Bjarmas
o
n
git-branch: remo
v
e
l
ego
i
n
i
18n messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Ju
n
io C H
a
mano
The s
e
venth
bat
c
h
o
f
topics gradu
a
ted to 'master'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio C Hamano
Merge br
a
n
c
h 'js/da
e
mon-test-race-fix
'
commit
|
commitdiff
|
tree
2012-04-30
Junio
C
Hama
n
o
Merge
b
ranc
h
'kk/
g
itwe
b
-omit-expensive'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge branch
'
kk/main
t
-gitweb-
m
iss
i
ng-ow
n
er'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge b
r
anch 'rs
/
commit-list-append'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge branch
'
m
m/include-u
s
erpath'
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio C
Hamano
Merge branch 'pw/t58
0
0-import-race-fix
'
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio C Ham
a
no
Me
r
ge bra
n
ch 'jk/repack-no-explode-o
b
jects-from-old
.
.
.
commit
|
commitdiff
|
tree
2012-04-30
Jeff
K
ing
co
n
fi
g
: expan
d
tildes in include
.
path v
a
riable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Jun
i
o C Ham
a
no
Me
r
ge
g
i
t:/
/
g
i
t
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2012-04-27
Junio
C Hamano
i
n
dex-v4: d
o
c
u
m
en
t
th
e
e
n
try fo
r
mat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next