repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix twoway_merge that passed d/f conflict marker to merged_entry().
2007-03-14
Junio C Hamano
Merge branc
h
'jc/f
e
t
c
h'
commit
|
commitdiff
|
tree
2007-03-14
J
unio C Ham
a
no
Merge branch 'dz/mailinfo
'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Merge branch 'jb/per-user-exclude'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Ham
a
n
o
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
M
e
rge branch
'pb
/
branch-track'
commit
|
commitdiff
|
tree
2007-03-14
Jim Meyering
git-grep:
d
on't u
s
e sscanf
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Johan
n
es Schindel
i
n
Do not output "GEN " wh
e
n generat
i
n
g perl
.
mak
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Juni
o
C H
a
mano
shor
t
l
o
g: prompt
when reading from terminal by mistake
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Documenta
t
ion
:
a
dd git-mergetool to the
command list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C
Ha
m
ano
Merge br
a
nc
h
'master'
o
f g
i
t://repo
.
or
.
cz/git/m
e
rgetool
commit
|
commitdiff
|
tree
2007-03-14
E
r
ic Wong
git-svn
:
add -l/--local command to
"
git svn rebase"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Frank Lich
t
e
n
held
c
v
sserver: asciidoc formatt
i
ng c
h
ang
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-13
Shawn O
.
Pearce
Use run_c
o
mmand with
i
n
s
end-
p
ac
k
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-13
Shawn O
.
Pearc
e
Use ru
n
_command within receive-
p
ack to invoke ind
e
x
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-13
Shawn O
.
Pe
a
rce
Use run_command withi
n
merge-index
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-13
Shawn O
.
Pearce
Use r
u
n
_command
f
o
r proxy c
o
nnec
t
ions
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-13
Shawn O
.
P
earce
Use RUN
_
GIT_CMD to run push
b
ackend
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-13
Shawn
O
.
Pearce
Co
r
rect new com
p
iler
w
a
rnings
i
n builtin-rev
e
rt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-13
Shawn O
.
P
e
arce
R
ep
l
ace fork_with_pipe in bundle with run_command
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-13
S
hawn O
.
Pearce
Teach run-command to redirect
s
t
d
o
ut to /dev/n
u
ll
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-13
Shawn
O
.
Pearce
Teach
run-comm
a
n
d about stdou
t
redirection
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-13
Don Zicku
s
Add a couple more test c
a
ses
t
o the suite
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-13
Do
n
Zickus
r
e
st
r
i
c
t the patch fi
l
terin
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-13
Don Zickus
builtin-mailinfo
.
c
infrastr
c
ture
cha
n
ges
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-13
J
u
n
io C Ha
m
ano
M
e
rge br
a
nch 'master' of git:
/
/rep
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-03-13
J
unio C Hamano
Merge br
a
n
c
h 'maint
'
commit
|
commitdiff
|
tree
2007-03-13
Junio C Hamano
M
e
r
ge b
r
anch 'ma
s
ter' of gi
t
://rep
o
.
or
.
cz/
g
it/fastimpo
r
t
commit
|
commitdiff
|
tree
2007-03-13
Junio C Hamano
Me
r
ge branch 'maint'
of gi
t
://repo
.
or
.
cz/git/fastimport
.
.
.
commit
|
commitdiff
|
tree
2007-03-13
S
hawn O
.
P
e
arce
Fix t5510-fet
c
h's
u
se of s
e
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-12
Shawn O
.
Pe
a
rce
Simplify
closing t
w
o fds at once i
n
run-command
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-12
Shawn O
.
Pe
a
rce
Don't pac
k
age the git-gui credits f
i
l
e anymore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-12
Ju
n
io C Hamano
M
erge bra
n
ch 'maint' of git
:
//repo
.
o
r
.
cz/git-gui
into
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Linus Tor
v
alds
R
e
-
fix
get_sha1_oneline
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-12
J
o
hanne
s
Sc
h
indelin
g
it-bu
n
dle: only
die
i
f pa
c
k
wou
l
d b
e
empty,
w
arn if
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-12
Avi Kivi
t
y
git-sen
d
-email: c
o
nfigu
r
able bcc a
n
d cha
i
n-repl
y
-
to
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-12
Junio
C
Ham
a
no
Merge
b
r
a
nch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-03-12
Avi Kivity
git-sen
d
-e
m
ail:
Document configur
a
ti
o
n opti
o
ns
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-12
J
.
Br
u
ce Fields
git-m
e
rge:
warn
w
h
en -m provided
on
a
fa
s
t forward
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-12
Junio C Ham
a
no
Mer
g
e branch '
j
c/boundary'
commit
|
commitdiff
|
tree
2007-03-12
Shawn
O
.
Pearce
Ch
a
nge
{
pre,post}-rec
e
ive hoo
k
s to use s
t
din
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-12
Shawn
O
.
Pearce
S
p
l
it back out update_hook handlin
g
in
r
e
c
eive-pack
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-12
Shawn O
.
Pearce
Re
f
ac
t
or run_comm
a
nd error handling
i
n r
e
ceive-pack
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-12
S
ha
w
n O
.
Pearce
Teach run_command how to s
e
t
up a s
t
d
in
p
ipe
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-12
S
h
awn O
.
Pe
a
rce
S
pl
i
t
run_comma
n
d
into two
h
alves (start/finish
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-12
Shawn O
.
Pea
r
c
e
Star
t
d
e
f
ining a more sophisti
c
ated run_comma
n
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-12
Shawn O
.
Pearce
Rem
o
v
e unused run
_
c
o
mman
d
v
ariant
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-12
Shawn O
.
Pearce
Switch to run_command_v_opt
in rev
e
r
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-12
Fran
k
Lich
t
enh
e
ld
cvs
s
erve
r
: Use Merged r
e
sp
o
nse instead of Update-existing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-11
Jim
Meyering
I like the idea o
f
the new
':/<
o
n
e
line
p
refix>' notation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-11
Ju
n
io C Haman
o
pr
e
pare_packed_
g
it(): so
r
t
p
acks
b
y
a
ge an
d
loca
l
nes
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
Fix brok
e
n creat
e
_branch() in
builtin-bran
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-11
Pao
l
o Bonzini
git-branch, git
-
che
c
k
o
ut:
autoset
u
p for remote branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
Merg
e
branch 'js/attach'
commit
|
commitdiff
|
tree
2007-03-11
Ju
n
io C
H
a
m
ano
M
e
rge b
r
anch 'j
s
/diff-ni'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
Merge
b
ra
n
c
h '
j
c/fsck'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
M
erge b
r
anch 'pb/commit
-
i
'
commit
|
commitdiff
|
tree
2007-03-11
Junio C
Hama
n
o
Merge branch 'js/rever
t
-cherry'
commit
|
commitdiff
|
tree
2007-03-11
Junio C H
a
ma
n
o
Merge
branch
'sp
/
make'
commit
|
commitdiff
|
tree
2007-03-11
Junio C
H
am
a
no
Merge
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-03-11
Al
e
xandre Julliar
d
git
.
e
l: Retrieve commit log inf
o
rmation from
.
do
t
est
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-11
Ale
x
andre Jull
i
ard
gi
t
.
el: Avoid
a
p
p
ending a si
g
noff line that is already
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-11
Matth
i
as Lederhof
e
r
se
t
up_g
i
t_direc
t
o
r
y_
g
e
n
tly: fix off-by
-
one
error
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
Merge branch 'maint' of gi
t
:
//linu
x
-nf
s
.
org/~bfield
s
.
.
.
commit
|
commitdiff
|
tree
2007-03-10
J
e
ff King
Documentation: s/seper
a
t
o
r/separator/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-10
Matthias Keste
n
holz
Adju
s
t
r
e
flog filemode i
n
share
d
reposito
r
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-09
James
B
owe
s
add: Support specifying an
e
x
cludes f
i
le wit
h
a configura
t
io
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-09
Paol
o
Bonzini
gi
t
-com
m
it: add a -
-
i
n
t
eractive option
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-09
Johannes Schinde
l
in
git-b
u
ndle: prevent ov
e
r
w
riting e
x
isting bundles
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-09
J
ohannes Schindelin
git-
b
undle: d
i
e if a given ref is
not incl
u
ded in bundle
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-09
Johannes
Sch
i
ndelin
git-bundle: hand
l
e thin packs in subcommand "unbundle"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-08
Junio C Hamano
Merge branch 'js/config-rena
m
e'
commit
|
commitdiff
|
tree
2007-03-08
J
u
nio C
Hamano
Merge br
a
nch
'
master'
o
f git://repo
.
o
r
.
cz/git/fastimport
commit
|
commitdiff
|
tree
2007-03-08
Johannes
Schindelin
gi
t
-bundle: Make
t
hin packs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-08
Johannes Schindeli
n
git
-
b
undle
:
avoid packing objects which are in th
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
S
h
a
w
n O
.
P
e
arce
Teac
h
r
e
ceive-pack to run pre-r
e
c
e
ive/p
o
s
t
-rece
i
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
S
h
aw
n
O
.
P
e
a
r
ce
R
e
factor handling of error_s
t
ring
i
n
r
ec
e
ive-p
a
ck
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
Shawn O
.
Pearc
e
Refac
t
or run
_
update_hook to be more
u
s
eful
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
Shawn O
.
P
e
a
rce
Don't ru
n
post-update hook unless a ref changed
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
Shawn O
.
P
earc
e
Move post-upda
t
e hook to after all
other
activity
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
Ju
n
io
C Ha
m
a
no
Merge
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2007-03-07
Shawn O
.
Pearce
Cast
6
4 bit o
f
f_t to 32 bit si
z
e_t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
Sha
w
n
O
.
Pearce
U
s
e
o
ff_
t
in p
a
ck-obj
e
cts/fast-imp
o
rt when we mean
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
Shawn O
.
Pearce
Use off_
t
when we re
a
lly mean a file offset
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
Shawn O
.
P
e
arce
Use uint32_t for pack
-
objects
c
ounters
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
Sh
a
wn O
.
P
e
arce
Us
e
uint32_t for all
p
acked object counts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
Shawn O
.
P
e
arce
General
c
onst cor
r
e
c
tness fixes
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
Sh
a
wn O
.
P
earce
Don't
b
uild external_grep if its not
us
e
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
Shawn
O
.
Pearce
Fix mmap leak c
a
us
e
d b
y
readin
g
bad indexes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
Shawn
O
.
Pearce
D
i
s
p
l
ay the null SHA-1
a
s t
h
e bas
e
for an OBJ_OFS_DELTA
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
P
aolo
Bonzini
git-arch
i
mport: allow
remapp
i
n
g b
r
an
c
h nam
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
S
anti B,Ai(B
j
ar
t/
t
5515-fetch-merge-logic
.
s
h: A
d
d tw
o
more tes
t
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
S
hawn O
.
Pearce
C
atch write_ref
_
sha1 failur
e
in receive-pack
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
Johannes
S
chindel
i
n
b
u
ndle: fix
wrong check of read_header()'s return value
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
Jak
u
b Narebski
gitweb
:
Do
n
't escape attributes in CGI
.
p
m HTML metho
d
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
Alex Riese
n
Al
l
ow "make -w" generate its usual o
u
tput
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
Alex Riesen
Supp
o
rt of "make -s": do not output anyt
h
i
ng of the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
Alex Ries
e
n
More
build output cleaning up
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-07
J
o
hannes Sch
i
n
d
e
l
in
make
t
8001 work
o
n Ma
c
O
S
X agai
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Ham
a
no
revisi
o
n --boundary: fix u
n
count
e
d case
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
L
i
Y
ang
gitweb: Change to us
e
expl
i
citly functi
o
n cal
l
cg
i
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next