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
Use extended SHA1 syntax in merge-recursive conflicts.
2006-12-23
Sh
a
wn O
.
Pearce
U
se extended
S
HA1 syntax in
merge-
r
e
c
ursive conflict
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Rober
t
F
i
tzsim
o
ns
gitweb: All
o
w search to
b
e disabled
f
rom the config
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
gitweb: Require a minimum of
t
w
o character f
o
r the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Rob
e
rt
F
itzsimons
g
i
tweb: Use rev-list
pa
t
t
e
r
n
search opt
i
o
n
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Nicolas
Pitre
checkout:
m
ake th
e
message about the need for a
new
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
R
o
bert
F
i
tzsi
m
ons
gitw
e
b: o
p
t
i
m
i
ze git_su
m
m
a
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
g
it
w
eb
:
optimize git_shortlog_body
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Rober
t
Fitzsimons
gi
t
web
:
o
p
timize g
i
t_get_la
s
t_activ
i
ty
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
R
o
bert Fitzsimons
gi
t
we
b
: Add missing show '
.
.
.
'
li
n
ks
c
hange
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
B
rian Gernhardt
Make git-show-branch optio
n
s similar to git-br
a
nch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
B
r
ian Gernha
r
d
t
Kee
p
"git --git-di
r
"
f
r
om causing a
b
us error
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Eri
c
Wong
gi
t
-svn: en
a
ble co
m
mon fetch/commit options
f
or dc
o
m
m
it
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Alexandre J
u
lliard
vc
-
git:
Ignore errors caused by
a
non-exi
s
tent dir
e
ctory
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Eric Wong
Remove NO_
A
CCURATE_DI
F
F op
t
ions from build systems
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Juni
o
C Hamano
g
it
-
tag: lose exit after die
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
J
un
i
o C Hamano
Really fix he
a
ders for __FreeBSD__
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Ju
n
io C
H
a
mano
D
o
not sup
p
ort "p
a
rtial
UR
L
s
h
orthand" anymore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
default pu
l
l: forget about "n
e
wbie protection" for
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio
C
Ham
a
n
o
merge
a
n
d res
e
t: ad
j
u
s
t for "reset --hard"
m
essages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
un
i
o
C
H
amano
commit-
t
r
ee: do not
over
f
low MAXPARENT
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pea
r
c
e
I
n
troduc
e
a
g
lob
a
l l
e
vel
warn()
f
u
n
ction
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Sha
w
n
O
.
Pearce
Rename ima
p
-s
e
nd's in
t
e
rnal i
n
fo/w
a
rn functions
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio
C
Hamano
_X
O
PEN_SOU
R
CE problem
a
lso exi
s
ts on FreeBSD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hama
n
o
p
arse-remote:
m
ar
k
all refs not f
o
r merge only w
h
e
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
unio C Hamano
Me
r
ge branch
'
m
aint'
commit
|
commitdiff
|
tree
2006-12-22
Johannes
S
chindelin
git-reset --hard: tell the user what
t
he HEAD was reset to
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindelin
g
i
t-tag: support -F
<file> option
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
Re
v
ert "git-pull: refu
s
e de
f
ault me
r
ge without br
a
nch
.
.
.
commit
|
commitdiff
|
tree
2006-12-22
Sha
w
n
O
.
Pearce
Suggest 'add' in am/revert/cherr
y
-pick
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
o
han
n
es Sc
h
indelin
Use
gi
t
-m
e
rge-file in git-m
e
rge-on
e
-file, too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Sch
i
ndelin
dif
f
--check: fix of
f
by one error
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
Q
u
y
Tonthat
Doc
u
mentation/gi
t
-bra
n
ch:
n
ew -
r
to del
e
te r
e
mot
e
-tracking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
T
e
rje
Sten Bjerkseth
F
ix system
head
e
r pro
b
lems on M
a
c OS X
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
Junio C Hamano
Me
r
g
e b
r
anch '
e
w/svn-pm'
commit
|
commitdiff
|
tree
2006-12-20
Junio
C
Hamano
diff docu
m
ent
a
tion: mostly ta
l
k about <commit>
commit
|
commitdiff
|
tree
2006-12-20
Jun
i
o C Hamano
Merge
branch
'jc/le
f
trigh
t
'
commit
|
commitdiff
|
tree
2006-12-20
Junio
C Hamano
Merge branch 'jc/blame'
commit
|
commitdiff
|
tree
2006-12-20
J
u
n
i
o
C Ham
a
no
M
e
rge
b
ranch 'jc/branch-remove
-
r
e
mote'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
M
erge branch
'jc/cl
o
ne'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hama
n
o
compa
t
/
inet_nto
p
:
d
o not
u
se u_i
n
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
spurious
.
sp i
n
manpages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
git-
a
d
d: error
o
ut when given
no a
r
guments
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Junio C
H
amano
M
e
rge bran
c
h
'm
a
int'
commit
|
commitdiff
|
tree
2006-12-20
Junio
C Ha
m
ano
GIT 1
.
4
.
4
.
3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
N
i
colas Pitre
c
l
arify some error
messages wrt unkno
w
n object t
y
p
es
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Junio
C
Ham
a
no
sim
p
lify inclusion of sy
s
tem he
a
de
r
files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Nicolas P
i
tre
index-pack usage
o
f
mmap() is unaccepta
b
ly slower
o
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Robert Fitzsimons
gi
t
web: Show '
.
.
.
'
links i
n
"summary" view only if
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
con
f
i
g
_rename_se
c
tion: fi
x
FILE*
l
eak
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
B
r
ian Gernh
a
rdt
Remov
e
C
OLLIS
I
ON_CHECK fro
m
Makefile
s
i
n
ce it's not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Ham
a
no
fix populate-f
i
l
espec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
E
r
ic Wong
g
i
t-cvsserver: fix b
r
eakag
e
when calling git
m
e
r
ge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
J
un
i
o C Hamano
R
e
vert "Make le
f
t-r
i
ght automatic
.
"
commit
|
commitdiff
|
tree
2006-12-19
Josef Weidend
o
r
f
er
M
ove
"no
m
e
rge can
d
i
d
ate" war
n
ing into git-pull
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Haman
o
Use pre
p
rocessor
c
onstants for environment var
i
abl
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Do not create $GIT_D
I
R
/remotes/ directory any
m
ore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
J
u
ni
o
C Hamano
Merg
e
branch 'jc
/
test-clone
'
i
nto jc/cl
o
ne
commit
|
commitdiff
|
tree
2006-12-19
Joh
a
nnes Sc
h
i
ndelin
Introdu
c
e
G
IT_TEMPL
A
TE_
D
I
R
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Revert
"fix testsuite
:
make s
u
re they
u
s
e templates
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
J
unio C Hamano
b
l
ame: -b
(b
l
ame
.
b
l
ank
b
o
un
d
ary) and --root (b
l
ame
.
showroo
t
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Quy To
n
t
h
a
t
git
-
branch -d: do not st
o
p at the firs
t
f
a
ilure
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
J
unio C Haman
o
Teach git-branch to delete
tr
a
cking branches with
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Junio C
H
a
man
o
fix testsuite:
m
ake sure they use templa
t
e
s
fr
e
s
hly
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Juni
o
C Hamano
rerere: fi
x
bre
a
kage of res
o
l
ving
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Aneesh Kumar K
.
V
Add config
e
x
a
mple w
i
th respect to
b
ranch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Brian Ge
r
nhardt
Add docu
m
entat
i
on
f
or
show-br
a
nch --to
p
i
c
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Ni
c
olas P
i
t
r
e
ma
k
e git a b
i
t less cryptic on fetc
h
errors
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Nicolas Pitr
e
make patch_delta() error
cas
e
s a bit more
verbose
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o
C Hamano
r
a
cy-g
i
t: documenta
t
ion up
d
ates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
Hamano
show-ref: fix --exclude-existing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Ju
n
i
o
C Hamano
parse-
r
emote:
:
expan
d
_refs_wil
d
card()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Jeff
King
v
im syntax: foll
o
w recent changes to co
m
m
i
t temp
l
ate
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
Hamano
s
how-ref: fix --
v
eri
f
y --hash=length
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C H
a
mano
show-ref: fix
--
q
uiet --v
e
r
ify
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Merge branch
'
j
c
/blame-boundary'
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o
C H
a
mano
Merge branch 'jc/reflog
'
(ear
l
y
p
art)
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Me
r
ge branch 'js/
b
r
a
nch-c
o
nfig'
commit
|
commitdiff
|
tree
2006-12-18
J
unio
C
Hamano
Merge bra
n
ch '
j
n/web' (early
p
a
r
t
)
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
Ham
a
no
a
v
oid acces
s
ing _
a
ll_ loo
s
e
refs
in
gi
t
-
s
how-ref -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C Hamano
git-fetch: Avoid read
i
ng packed
refs over an
d
ove
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C Hamano
T
e
ach
s
h
o
w-b
r
anch how to show
ref-log
d
ata
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io C Hamano
Make left-right automatic
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Teach
all of log fa
m
ily --left-right output
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
re
v
-list -
-
lef
t
-right
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hama
n
o
m
arkup fix in svnimport
do
c
umentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Quy
T
onthat
Do
c
u
mentat
i
on: new
op
t
i
o
n -P for git-s
v
nimport
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C H
a
mano
Fix
mis-mark-up in git-mer
g
e-fil
e
.
txt documentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Shawn O
.
Pe
a
rce
Default GIT_COMMITTER_NAME t
o
l
ogin nam
e
i
n
recieve
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio
C Ham
a
n
o
Fix ch
e
ck_file
_
directory_confli
c
t()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
git-add: remov
e
c
o
n
f
licti
n
g entry
when adding
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C Hama
n
o
updat
e
-index: make D/F
conflict error a bit
more ve
r
bose
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Joha
n
nes Schin
d
elin
g
i
t-bran
c
h:
r
enam
e
config vars
branc
h
.
<branch>
.
*, too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
J
ohannes Schindelin
ad
d
a function to rename
secti
o
ns in t
h
e config
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Juni
o
C
Hamano
git-clone: lo
s
e
t
he traditi
o
nal 'no-separate
-
remote
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Jun
i
o C Hama
n
o
git-clon
e
: lose the art
i
ficia
l
"first" fetch
refspec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Juni
o
C Hama
n
o
git-
p
ull:
r
efuse default merge without b
r
anch
.
*
.
merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
git
-
clone: us
e
wil
d
ca
r
d
specification
for trac
k
ing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C
Hamano
merge: give a bit pre
t
tier merge messa
g
e to "merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Jak
u
b Narebski
g
i
twe
b
: Add "next" link to commit view
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Jakub Narebski
git
w
e
b
:
Add
t
i
t
le
a
tt
r
i
b
ute to r
e
f
m
a
rker with full
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next