repo.or.cz
/
git
/
gitweb-caching.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'cc/merge-base-many'
2008-08-21
Junio C H
a
ma
n
o
Merge branch 'cc/merge-b
a
s
e-
m
any'
commit
|
commitdiff
|
tree
2008-08-21
J
unio C
Hamano
M
e
rg
e
branch 'jc/test-
d
eeper
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ham
a
no
Merge
b
ranc
h
'
js/parallel-t
e
st'
commit
|
commitdiff
|
tree
2008-08-20
Junio C H
a
m
a
no
Update draft release notes f
o
r
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Hamano
Update draft release notes for
1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Tarmigan Caseb
o
lt
Add
hints
t
o re
v
ert documentation about other ways
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Johanne
s
Sixt
I
nstall template
s
with the user and group of the inst
a
lli
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C
H
amano
"git-merge": allow fast-fo
r
warding in a stat-dirt
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hama
n
o
comple
t
io
n
: find out su
p
por
t
ed m
e
rge strategies correctl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
eff
King
decorate: allow const objects to be decorated
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Ha
m
ano
for-each-r
e
f:
c
o
pe with tags
with in
c
o
m
plete lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C Hamano
dif
f
--
c
h
e
ck: do not get confus
e
d by new bl
a
nk lines
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Ha
m
ano
Merge branch 'bd/diff-
s
trbuf'
commit
|
commitdiff
|
tree
2008-08-20
J
u
n
io C Hamano
Merge branch 'dp
/
hash-literally'
commit
|
commitdiff
|
tree
2008-08-20
J
unio
C Hamano
Mer
g
e branch '
j
s/
c
heck
o
u
t-dw
i
m-local'
commit
|
commitdiff
|
tree
2008-08-20
J
unio
C
Hamano
Merge branch 'ph/enable-threaded'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Haman
o
Me
r
ge
b
r
a
nch
'
jk
/
pager-swap'
commit
|
commitdiff
|
tree
2008-08-20
Junio C
H
a
m
a
n
o
Merge bran
c
h 'rs/imap
'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C Hama
n
o
Merge bran
c
h 'js/mingw-stat'
commit
|
commitdiff
|
tree
2008-08-20
J
i
m Mey
e
ring
r
e
mote
.
c: remove useless if-be
f
o
re-free test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jeff
King
mailin
f
o:
a
void viol
a
ti
n
g strbuf
a
s
sert
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jim M
e
yeri
n
g
reword
-
-full-in
d
ex description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
i
m Meyeri
n
g
Submit
t
ingPatches: fix a typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Ji
m
Meyering
add boolean diff
.
sup
p
re
s
s
-
blank-empty c
o
nfig option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyer
i
ng
g
i
t f
o
rmat-
p
atch
:
avoid und
e
rrun when f
o
rmat
.
headers
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Juni
o
C Ha
m
ano
Merge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2008-08-19
Brandon Ca
s
ey
t1002-read-tree-
m
-
u-2way
.
sh:
u
se 'git diff -U0' r
a
t
h
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Marcus Griep
Up
d
ate t/
.
gitignore to
i
gnore all trash directori
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Johann
e
s Sixt
Revert "Window
s
: Use a customized struct
s
t
a
t tha
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Jun
i
o C H
a
mano
compat: i
n
troduce on_disk_by
t
es()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Robert Sch
i
ele
adap
t
git-cvsserver
manpag
e
to da
s
h-fre
e
syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Don Zickus
m
a
ilinfo:
re
-
fix MIME m
u
ltipart b
o
undary
p
arsi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C
H
amano
S
tart 1
.
6
.
1
c
y
cle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
u
nio C H
a
man
o
Start 1
.
6
.
0
.
X
m
aintenan
c
e series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C
Hamano
GI
T
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
unio C Hamano
Merge git-
g
ui
0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Ju
n
io
C H
a
mano
Merge
b
r
a
n
ch 'ak
/
p4'
commit
|
commitdiff
|
tree
2008-08-17
Ju
n
i
o
C Haman
o
tests: use $TEST_DIRECTORY to refer
t
o
t
he t/ directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Robert
B
l
um
g
it-p4: ch
d
ir no
w
pr
o
p
e
rly sets PWD enviro
n
ment variable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Stephan
B
eyer
Improve error output of git-reba
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t9300:
replace '!' wi
t
h
test_must_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio
C Hamano
M
e
r
g
e git
:
//git
.
kernel
.
org/pub/scm/g
i
tk/git
k
commit
|
commitdiff
|
tree
2008-08-16
Marcus Griep
Git
.
pm: Ma
k
e File::Spec and File::Tem
p
requiremen
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Miklo
s
Vaj
n
a
Do
c
um
e
ntation: document the
pager
.
*
configuration setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Steph
a
n
B
ey
e
r
git-stash: imp
r
o
v
e
synopsis in help and
manual
p
age
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Eric Blake
M
a
k
efile:
building g
i
t in cy
g
win
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Stepha
n
Beyer
git-
a
m: ign
o
re
-
-bina
r
y
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Marcus
G
riep
b
a
sh-com
p
l
e
tion: Add no
n
-command g
i
t
h
elp fi
l
es to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Alex Riesen
F
i
x
t3700 on fil
e
systems
whic
h
do
not s
u
ppo
r
t question
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Anand Kumria
U
tilise our n
e
w p4_re
a
d_pipe and p4_wri
t
e_pipe wrapp
e
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
An
a
nd
K
umria
Add p4 r
e
a
d
_pipe an
d
w
rite_p
i
p
e
wr
a
ppers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
L
e
e Ma
r
low
bash comp
l
etion
:
Add '-
-
merge' long option for '
g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Lee Marlo
w
bash comp
l
e
ti
o
n
:
A
d
d co
m
pletion for 'git
mergetool'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
M
a
tt McCutchen
g
i
t fo
r
mat-p
a
tch documentation:
clarify what --cover
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Eric Ra
i
ble
ba
s
h
c
omp
l
etio
n
: 'git apply
'
should use 'fix' not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Junio C Hamano
xdiff-interfac
e
: hide the
w
hole "xdiff_emit_state"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
B
r
ian D
o
wning
Use strbuf for struct xdiff_emit_state's remai
n
d
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Bri
a
n Downing
Make xdi_diff_outf
interface f
o
r
r
unning xdiff_out
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
J
u
ni
o
C
Ha
m
ano
M
erge branch 'maint
'
commit
|
commitdiff
|
tree
2008-08-14
Brandon Cas
e
y
t5304-p
r
une: a
d
just file mtime based
on sy
s
tem time
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Brandon Casey
t
est-parse-options
:
u
s
e a
p
propriate cast in len
g
th
_
callback
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Ke
v
in Balla
r
d
F
ix
escap
i
ng of glob speci
a
l charact
e
r
s in pathspecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
rebase -i
-
p
:
f
ix parent rewr
i
ting
commit
|
commitdiff
|
tree
2008-08-13
Thom
a
s Rast
reb
a
se -i -p: handle index and workdir co
r
rectly
commit
|
commitdiff
|
tree
2008-08-13
Junio C Ha
m
ano
G
IT 1
.
6
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
Merge
b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
Do not talk about "diff" in
r
e
v-list
d
ocumenta
t
ion
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Ju
n
i
o
C Hamano
Merge git://
g
it
.
bo
g
omips
.
org
/
git-s
v
n
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
Doc
u
mentation: rev-l
i
st-options: Rewrite s
i
mplific
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Gustaf H
e
ndeby
Teach git
diff
about BibTeX head hunk pa
t
terns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Gust
a
f Hend
e
by
gitattributes: Document built in hunk header patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Stephen R
.
van den
.
.
.
git-daemon:
Sy
s
V ne
e
ds
t
he signal ha
n
dler reinsta
t
ed
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Junio C Ha
m
ano
d
i
ff --
c
heck: do not un
c
onditi
o
n
a
lly complain about
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Junio C Hamano
Merge b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-12
Anand
K
umria
Put in the two other con
f
igur
a
tion elements found in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
A
nand Kumria
Put some
docu
m
entat
i
on in a
b
out the parame
t
e
r
s
th
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
A
nand Kumria
Move git-p4
.
syncFromOrigi
n
into a configuration parameters
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Consistently use 'git-p
4
' for
t
he configur
a
tion entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand
K
u
mria
If t
h
e user
has config
u
red var
i
o
us parame
t
ers, use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand
K
umria
Switch
to us
i
ng 'p4_build_cmd
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumri
a
I
f we a
r
e
i
n
verbose mo
d
e, out
p
ut what w
e
are ab
o
ut
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand K
u
mria
Add a sin
g
le command that will be used to construct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
An
a
nd Kumria
Util
i
se t
h
e
new 'p
4
_syst
e
m' function
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
A
n
and Kumria
Have
a comm
a
nd that spec
i
fically
invokes 'p4' (via
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Uti
l
ise th
e
n
e
w 'p4_read_pipe_li
n
es'
c
ommand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
C
reate a specific version of the read_pipe_line
s
c
ommand
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Tho
m
as Rast
Document
a
t
ion: rev
-
l
i
st-op
t
io
n
s: Fix a typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Petr
Baudis
Adju
s
t for the new way of enabling
th
e
default post
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Franc
i
s Moreau
git-bisect:
f
ix wrong usag
e
of r
e
ad(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
N
guyễn Thái Ngọ
c
Duy
Fix t
y
p
o in comments
of
l
onge
s
t_ancestor_length()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Johannes Schindelin
c
heck
o
ut --track: make up a sensibl
e
b
ra
n
c
h name
if
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Junio
C
H
amano
Merge b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2008-08-11
Junio C Hamano
R
e-fix rev-list-options do
c
umentati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Junio C Ham
a
n
o
Merge b
r
anch
'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-11
I
van S
t
ankovic
Document
a
t
i
on: fix invalid ref
e
ren
c
e
to 'mybranch'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Junio C Hamano
Fix deleting reflog
entri
e
s fr
o
m HE
A
D reflog
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Pieter de Bie
r
eflog tes
t
:
add
m
o
re t
e
sts for 'reflog delete'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Thomas Rast
D
o
c
u
mentati
o
n:
rev-list
-
opt
i
ons: Fix -g pa
r
agraph formattin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
Junio
C
Hamano
U
p
da
t
e
draft
R
el
N
otes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next