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
Merge branch 'ap/branch'
2006-12-13
Junio C
H
amano
Mer
g
e
branch 'ap
/
b
ran
c
h'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
b
ra
n
ch --c
o
l
o
r: change de
f
ault c
o
l
or select
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'js/m
e
rge'
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
mano
sen
d
-pack: tighten che
c
ks for remote names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C
H
am
a
no
g
i
t-push:
a
cce
p
t tag <t
a
g> as advertised
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
spurious
.
sp in manpa
g
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git mer
g
e: reword fail
u
re message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Shawn Pearc
e
Remove
u
nc
o
ntested
r
enamed files during merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Ham
a
no
M
e
rge branch 'main
t
'
commit
|
commitdiff
|
tree
2006-12-13
Eri
c
W
ong
git-svn: correctl
y
dis
p
lay fatal()
error
m
essages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric
Wong
git-svn:
e
xit with status
1
for test failures
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Andy Parkins
A
l
l
o
w subcomman
d
.
color and col
o
r
.
subco
m
mand color conf
i
gura
t
io
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
git-push:
d
ocument
r
e
m
oval of remo
t
e ref wi
t
h :<
d
st
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Joh
a
nnes
Schindelin
me
r
ge-recursive: add/add really is m
o
di
f
y
/modify with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Hamano
Merge branch 'master' into
j
s/
m
e
r
ge
commit
|
commitdiff
|
tree
2006-12-13
Johan
n
es Schindelin
Get rid of the dep
e
n
d
e
ncy on RCS' merge program
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
git-svn: correctly ha
n
dle p
a
cked-refs i
n
r
efs
/
r
emotes/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
M
e
r
ge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
ano
add test case
f
or recu
r
siv
e
m
e
rge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
E
r
i
c
Wong
gi
t
-svn: cor
r
ect
l
y
di
s
pl
a
y
fatal
(
) error messa
g
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
g
it-svn:
allow dcomm
i
t to take
a
n alternate head
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wo
n
g
git-
s
vn:
enab
l
e logging of information
not suppo
r
ted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Alex R
i
esen
Cla
r
ify f
e
tch error for missing objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
B
r
ian Gernhardt
Move Fin
k
and Ports check to after config fi
l
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
And
y
Parkins
Colourise g
i
t-br
a
nc
h
output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C
H
ama
n
o
shortlog: fix segfault on empt
y
authorname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Jun
i
o
C
Hamano
shortlog: remove "[PATC
H
]"
p
r
efix from sh
o
rtlog output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
M
e
r
g
e branch 'mai
n
t'
commit
|
commitdiff
|
tree
2006-12-11
S
hawn O
.
P
e
a
r
c
e
Make s
u
re the empty tree exists
w
hen needed in merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Jim Meyerin
g
Don'
t
use
m
e
mcpy when source
a
n
d dest
.
buffers may
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Chris Wr
i
g
ht
no need to instal
l
m
a
n
pag
e
s as
execu
t
able
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
J
.
Bruce F
i
el
d
s
Documentation: simpler shared repository creation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Jeff K
i
ng
shortlog
:
fix segfault
o
n empty authorname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Josef Weidendorfe
r
A
dd branch
.
*
.
m
erge warni
n
g an
d
docum
e
n
t
ation
update
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
J
un
i
o C Hamano
Fix pe
r
l/ buil
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Eric
W
o
ng
git-svn: us
e
do_
s
witch for --follo
w
-parent i
f
th
e
S
V
N
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Uw
e
Zeisberger
Fix document
a
tio
n
copy&paste typ
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
E
ric Won
g
g
it-svn: extra e
r
ror check to e
n
sure we open a
fil
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
J
.
Bruce Fi
e
lds
Docum
e
ntation: update git-cl
o
n
e
man
page with new behavi
o
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Juni
o
C H
a
mano
Merge
b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2006-12-07
M
artin Langh
o
ff
cvsserver: Avoid miscount
i
ng
bytes in Per
l
v5
.
8
.
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Nicolas Pitre
ch
a
nge the unpack
li
m
it treshold
t
o
a
sane
r
value
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
J
.
Bruce Fields
Documentation: reorgani
z
e cvs-migr
a
ti
o
n
.
txt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Juni
o
C Ha
m
ano
git-me
r
ge
:
fix "
f
ix confusion between tag and branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
E
ric Wong
git-s
v
n: avoid network t
i
meo
u
ts for long-run
n
ing fetches
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Ja
k
u
b
Narebski
gi
t
web: Allow PNG,
GIF,
JPEG images
to b
e
disp
l
a
yed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio
C
Hamano
git
-
merge: squelch ne
e
d
l
e
s
s error message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
unio
C Ha
m
a
no
Merge
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
git-r
e
set to remove "
$
GIT_DIR/MERGE_MSG"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Johannes Schind
e
lin
merge-fi
l
e: s
u
pport -p and -q; fix
co
m
pile warnings
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Johannes Schindelin
Add builtin me
r
ge
-
f
i
l
e
, a minima
l
r
epla
c
ement for RCS
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
.
Bruce Fie
l
ds
cvs
-
migration: improved section titles, better push
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Joh
a
nn
e
s S
c
h
indelin
c
v
s-migra
t
i
o
n document: m
a
ke the need for "push"
more
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
J
o
hannes
S
chindelin
xdl_merge(): fix and simplify conflict handling
commit
|
commitdiff
|
tree
2006-12-05
Jakub Narebski
Docum
e
nt git-diff whites
p
ace f
l
ag
s
-b and -w
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Johannes Schindelin
diff -b:
i
gnore whites
p
ace at end of line
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Ju
n
io C Hama
n
o
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2006-12-04
Junio C Hamano
u
npack
-
tr
e
es
:
m
a
ke sure "df_conflict_ent
r
y
.
name" is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Junio C
Haman
o
r
eceive-pa
c
k:
d
o
not
i
nsist o
n
fast-for
w
ard outside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Mich
a
el Loeff
l
er
g
it-fetch: ignore derefer
e
nc
e
d
tags
in ex
p
and_refs_wild
c
ard
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Jaku
b
Narebski
git-clone: Rename --u
s
e-immingle
d
-r
e
mote option
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Jakub Nar
e
bski
gitwe
b
: Fix Atom feed <logo>:
i
t i
s
$logo, no
t
$logo_url
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
A
l
e
x
Riese
n
Make perl/ build pro
c
edure ActiveSta
t
e friendly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
D
avid Mil
l
er
Pa
s
s -M
to diff in request-p
u
ll
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Jim Meyering
Set pe
r
m
i
ssions
o
f
each n
e
w
f
ile
b
efore "cvs
add"in
g
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Johannes Sch
i
ndelin
git-
m
v
:
search more precise
l
y for source d
i
rectory
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Joha
n
nes Sc
h
indelin
xdl_merge(): fix thinko
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Johanne
s
Schindelin
xdl_merge():
fi
x
an of
f
-by-one
b
u
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C H
a
m
a
no
merge-r
e
cursive: us
e
xdl_merge()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
J
u
nio C Hama
n
o
xmerge: make return va
l
ue fro
m
xdl_merge() more usab
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Johannes Schi
n
d
e
lin
x
diff: add xdl_merge(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
J
u
nio C H
a
mano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2006-12-03
Eric Wo
n
g
git-svn: avoid fetching
f
iles tw
i
c
e in the same revision
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Ham
a
no
gi
t
-
m
erge: fix confusion between tag and branch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
A
ndy Parkins
De-empha
s
ise the symbolic link docume
n
tation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
A
ndreas Eri
c
s
s
on
git-diff
:
Introduce --in
d
ex
a
nd deprec
a
t
e
--cac
h
e
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
Andreas Ericsson
ls-files: Give h
i
nts
w
h
en
err
o
rs happen
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-30
Nicolas Pitre
pack-
o
bj
e
cts: remove red
u
ndent status infor
m
at
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
io
C
Hamano
Mer
g
e
m
a
s
te
r
.
k
e
rne
l
.
org:/pu
b
/scm
/
gitk/gitk
commit
|
commitdiff
|
tree
2006-11-29
Junio C Ha
m
ano
M
e
rge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
Andy Parkins
Documen
t
g
it-repo-config --bool/--int opt
i
ons
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C
H
aman
o
tut
o
rial: tal
k
ab
o
ut user
.
nam
e
e
a
rly and don'
t
start
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Alex R
i
ese
n
git-blam
e
: fix
rev parameter h
a
ndling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C H
a
mano
Merge branch 'jc/
g
lob
f
etch'
commit
|
commitdiff
|
tree
2006-11-29
Junio C
H
amano
M
e
rge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
J
u
nio C Ham
a
n
o
git blame -C
:
fix ou
t
put format tw
e
a
ks when crossing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Eric Wong
git-svn: fix multi
-
init
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
E
ric Wong
g
i
t-svn: d
o
c
u
me
n
tation updates
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Er
i
c Wong
git-sv
n
: color support for the log com
m
and
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Han-Wen Nienhuys
id
e
nt
.
c
:
Trim hint printed
w
hen gecos
i
s empty
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Shawn O
.
Pear
c
e
Fix broken bas
h
c
o
m
p
letion of
l
oca
l
re
f
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Shawn O
.
Pearc
e
Teach bash
how to c
o
mpl
e
te l
o
ng options for git-commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
E
ric W
o
n
g
git-svn: fix
o
utput reporting from the delta f
e
tcher
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
git
-
svn:
e
r
r
o
r out when
the
SV
N
connection fails during
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
René Scharfe
shortlog: remove ra
n
ge check
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
E
ric Wong
git-s
v
n: update tests for
r
ecent changes
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
git-svn: enable delta
t
ran
s
f
ers duri
n
g
fet
c
hes when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
A
n
dy Parkins
Use
.
git
/
config
f
or storin
g
"origin" shortcut reposi
t
o
r
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
J
o
hannes Schindel
i
n
sha
1
_ob
j
e
ct_info
(
): be consistent with re
a
d
_
sha1_fil
e
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next