repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Use extended SHA1 syntax in merge-recursive conflicts.
2006-12-23
Shawn O
.
Pearce
Use extended SHA1 sy
n
t
a
x in mer
g
e-r
e
c
ursiv
e
c
o
nflicts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
gitwe
b
: Allow
search to b
e
disabled fro
m
the config
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
R
o
bert Fitzsimons
gitweb: Require a minimum of two
c
harac
t
er
f
o
r
the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
gi
t
web:
Use r
e
v
-
list pattern search o
p
tions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Nicolas Pitre
c
h
eckout:
make the
message about the need for
a
new
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert
Fitzsimons
git
w
eb: optimize git
_
summary
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
gitweb:
o
ptimize g
i
t_sh
o
rtlog_b
o
dy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
gitweb: optimize git_
g
et_last_a
c
tivity
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fi
t
zsimons
gi
t
web: Add mis
s
ing show '
.
.
.
' links c
h
ange
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Brian Gern
h
ard
t
Make
g
i
t-show-bra
n
c
h
options si
m
ilar to git
-
branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Brian
G
ernhardt
Keep "git --git-dir" from causing
a
bus err
o
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
E
ric Wong
git-
s
v
n
: enable comm
o
n
fetch/commit options
for
dcommit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Alexandre Julliard
v
c
-
g
it: I
g
n
ore errors caus
e
d by a n
o
n-exist
e
nt dire
c
to
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Er
i
c Wong
R
e
move NO_ACCURATE_DIFF options
from
bu
i
ld
s
ystems
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
J
u
nio C Hamano
git-ta
g
: lose
exit after d
i
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
J
u
nio C Hamano
Really fix headers for __FreeB
S
D__
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Ha
m
ano
Do not sup
p
o
rt "par
t
i
a
l
URL short
h
and" anymor
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio
C Haman
o
d
efault pull:
f
o
r
g
et abou
t
"
newbie prot
e
ction" for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
J
u
nio C Haman
o
m
e
rge
a
nd reset: adjust for "reset --hard" mess
a
ges
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C
Hamano
commi
t
-tree: do not ov
e
rf
l
ow MAXPARENT
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Shaw
n
O
.
Pe
a
rce
Introd
u
ce a g
l
obal level w
a
r
n
()
function
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
P
e
ar
c
e
Rename imap-send's internal in
f
o/warn fu
n
ctions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Ju
n
io
C Hamano
_XOPEN_SOURCE prob
l
em a
l
so
e
xists on FreeBSD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
J
u
ni
o
C Ha
m
ano
parse-remote: mark all refs not for me
r
ge
only
w
he
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio
C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindelin
git-r
e
set --ha
r
d: tell the user wha
t
the HEAD was reset to
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Jo
h
annes Schindelin
git-tag: support
-
F <file>
o
p
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Ju
n
io C
Ham
a
n
o
Revert "
g
i
t
-pull:
refuse default m
e
rge
w
i
thout branch
.
.
.
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pearc
e
Suggest 'a
d
d
'
i
n
a
m
/
reve
r
t/ch
e
rry-pick
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Joha
n
nes Schin
d
e
l
i
n
U
s
e
git-me
r
ge-file i
n
git-merge-one-file
,
to
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Johan
n
es Schindeli
n
diff -
-
check:
fix
o
ff by one er
r
or
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-21
Qu
y
Tonth
a
t
D
o
c
u
men
t
ation/git-branch: new -r
t
o delete
r
emote-
t
racking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-21
Te
r
je Sten Bjerkseth
F
i
x
s
ystem head
e
r pr
o
bl
e
ms on Mac OS X
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-21
Junio
C Hamano
Merge branc
h
'ew/svn-p
m
'
commit
|
commitdiff
|
tree
2006-12-20
J
u
nio C
H
a
mano
diff
d
ocu
m
entation: m
o
st
l
y tal
k
abo
u
t <commit>
commit
|
commitdiff
|
tree
2006-12-20
Junio
C
Haman
o
M
e
rge br
a
nch 'jc/le
f
t
r
igh
t
'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
Me
r
ge branch 'jc/blame'
commit
|
commitdiff
|
tree
2006-12-20
Ju
n
io C Hamano
Merge branch 'jc/
b
ran
c
h-rem
o
ve-re
m
ote'
commit
|
commitdiff
|
tree
2006-12-20
J
unio C Hama
n
o
Merge branch 'jc/clone'
commit
|
commitdiff
|
tree
2006-12-20
J
u
n
i
o C Haman
o
compat/ine
t
_nto
p
: do not use u_int
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Ju
n
io C Hama
n
o
spurious
.
sp in manpages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Jun
i
o C Hamano
gi
t
-
add: e
r
ror ou
t
when give
n
no arguments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-20
Ju
n
io C
H
a
m
a
no
G
I
T 1
.
4
.
4
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Nicolas Pitr
e
cla
r
i
f
y some
er
r
o
r
m
essages wrt u
n
kno
w
n obj
e
c
t
t
y
p
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Jun
i
o C
Ham
a
no
simplify
i
nclusion o
f
sy
s
tem header files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Nicolas Pitre
index
-
pack
usa
g
e o
f
mm
a
p()
is unacceptabl
y
sl
o
w
e
r on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Robert
Fitz
s
imons
gitweb: Show
'
.
.
.
' links in "sum
m
ar
y
" view on
l
y if
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Ham
a
no
c
o
nfig_rename_section: fix FILE* leak
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
B
r
ian Gernhardt
Remove COLLISI
O
N_CHECK from Makefile since
i
t's no
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio
C Hamano
fix populate
-
f
i
l
e
spec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Eric Wong
git-cvsserver: fix breakage w
h
e
n
calling git merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C
Hamano
Revert "Make l
e
ft-rig
h
t
automatic
.
"
commit
|
commitdiff
|
tree
2006-12-19
Josef Weiden
d
orfer
Move "no merge candidate" warning
int
o
gi
t
-p
u
ll
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio
C Ham
a
no
Use preproc
e
ssor constants
f
or
e
nvironment variab
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
J
u
nio C Hamano
Do not create $GIT_DIR/remotes/ direc
t
ory
a
ny
m
or
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Ha
m
an
o
Merge branch 'jc
/
t
e
st-clone' i
n
t
o
jc/clone
commit
|
commitdiff
|
tree
2006-12-19
Johannes Schindelin
I
n
troduce GI
T
_
T
EM
P
LATE_DIR
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Re
v
ert "fix testsuite:
m
a
ke sure they use te
m
p
lates
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hama
n
o
blame: -b (bla
m
e
.
blankboundary) an
d
--root
(
b
lame
.
showroot)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Quy Tont
h
at
g
it-br
a
nch -d: d
o
n
ot stop at the first failure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
J
u
n
io C Hamano
Teach
git-br
a
n
c
h
t
o
d
elete tracking branches with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio
C
Hamano
fix
t
estsuite: make
sure they use templates freshly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
rerere: fix break
a
g
e
o
f
resolving
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Aneesh Kumar K
.
V
Add config exam
p
le
w
it
h
respe
c
t to branch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Bri
a
n Gernhardt
Add docume
n
tation for show-bra
n
ch --topics
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
N
i
colas Pitre
make git a
bit less c
r
yptic
on fetch errors
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Nicolas Pitr
e
m
ake patch_
d
e
lta() error c
a
ses a bit more verbose
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C
H
ama
n
o
rac
y
-git: documentat
i
on upd
a
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C Hamano
show-ref: f
i
x --exclude-existing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ham
a
no
pa
r
se-r
e
mo
t
e::expand_ref
s
_wildcard()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
e
ff
K
in
g
vim s
y
ntax: follow recent changes to commit template
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C H
a
mano
s
h
ow-ref: fix --verify --hash=l
e
ng
t
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
Hamano
show-ref
:
fix --q
u
i
e
t --verif
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio
C
Haman
o
Merge bran
c
h 'j
c
/blame-bounda
r
y
'
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o
C Hamano
Merge
branch '
j
c/reflog' (early part)
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
Hamano
Merge b
r
a
n
c
h 'js/branc
h
-config'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ha
m
ano
M
e
rge branch 'jn/web' (
e
arly part)
commit
|
commitdiff
|
tree
2006-12-18
J
unio C Hamano
avoid ac
c
essing _al
l
_ loose refs in gi
t
-s
h
o
w-ref -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ha
m
ano
git-fetch: Avoid readi
n
g p
a
cked refs over and over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
H
amano
Teach sh
o
w-br
a
nch
h
o
w
to sh
o
w re
f
-log dat
a
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C Ha
m
ano
M
a
ke
l
e
f
t
-right autom
a
tic
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
Haman
o
Teach all
of log family --lef
t
-ri
g
ht
output
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
r
e
v-lis
t
--left-right
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
u
n
io C Hamano
markup f
i
x
i
n svni
m
port documen
t
ation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Quy Tonthat
Doc
u
menta
t
ion:
n
ew option -P
for git-svni
m
p
o
rt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C Hamano
Fix
mi
s
-mark
-
up
i
n gi
t
-merge-file
.
txt documenta
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Shawn O
.
Pearce
De
f
ault
G
IT_CO
M
MITT
E
R
_
NAM
E
t
o
login name in recieve
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
u
nio C Hamano
Fix c
h
eck_file_directory_conflict
(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Jun
i
o C
Ha
m
ano
gi
t
-ad
d
: remov
e
confli
c
ting entry when adding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
updat
e
-
i
n
dex:
m
ak
e
D
/
F
conflict error a
b
i
t more ve
r
bose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Joh
a
nnes
Sch
i
ndelin
git-b
r
a
n
ch: rename c
o
nfig v
a
rs
bran
c
h
.
<branch>
.
*, too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Johann
e
s Schindelin
add a
fun
c
tion to ren
a
m
e
sections
i
n the config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
gi
t
-clone
:
lose th
e
traditional 'no-separ
a
te-remote
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
gi
t
-clone: lose the artifi
c
ial "f
i
r
st" fetc
h
r
e
fspec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
u
nio C Hamano
git-pull
:
refus
e
d
e
fault
merge without
br
a
nch
.
*
.
mer
g
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio
C
H
amano
git
-
clone:
u
s
e
wildc
a
rd specification for trackin
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
u
nio C Hamano
merge: gi
v
e a bit prettier
m
e
rge message to "merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Jakub Narebs
k
i
gitweb:
Add "next" link to comm
i
t view
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Jakub Narebski
gitw
e
b:
Add t
i
t
le at
t
ribute to
r
ef mar
k
er wit
h
fu
l
l
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next