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
Jun
i
o C H
a
mano
git-tag: lose
e
x
i
t after die
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
J
u
nio C Hamano
R
e
all
y
f
i
x header
s
f
or __FreeB
S
D
_
_
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
Do not su
p
port
"par
t
ial URL shorthand" anymo
r
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Ha
m
an
o
default
p
ull: fo
r
get abo
u
t "newbie protecti
o
n" f
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
merge and r
e
set: ad
j
ust
for "reset -
-
hard" mess
a
ges
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Juni
o
C
Hamano
c
ommi
t
-
tre
e
: do not ov
e
r
flow MAXP
A
RENT
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
J
u
nio C Hamano
_X
O
P
EN_
S
O
U
RCE pr
o
blem a
l
s
o
ex
i
sts on FreeBSD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
parse-re
m
ote:
mark all
r
efs not for merge
o
nl
y
when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Ju
n
i
o
C Hamano
M
erge
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
R
evert
"
g
i
t-pull: refuse
default merge without
b
ra
n
ch
.
.
.
commit
|
commitdiff
|
tree
2006-12-21
Junio C Hamano
M
e
rge branch '
e
w/svn-pm'
commit
|
commitdiff
|
tree
2006-12-20
Junio C H
a
ma
n
o
diff
d
ocumenta
t
ion: mostly talk abou
t
<commit>
commit
|
commitdiff
|
tree
2006-12-20
Junio C
H
amano
Merge branch 'jc/leftrig
h
t'
commit
|
commitdiff
|
tree
2006-12-20
Jun
i
o C Hamano
M
e
rge b
r
a
n
ch 'jc/blame'
commit
|
commitdiff
|
tree
2006-12-20
Jun
i
o
C H
a
mano
Merge branch 'j
c
/branch-re
m
ov
e
-r
e
mote'
commit
|
commitdiff
|
tree
2006-12-20
Ju
n
io C
H
amano
M
e
rge branch 'jc/clone'
commit
|
commitdiff
|
tree
2006-12-20
Junio
C
H
amano
compat/inet_ntop: do not use u_int
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Ju
n
i
o
C H
a
man
o
spurious
.
sp in
m
anpages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
J
unio C Hamano
git
-
add: er
r
or out when
g
i
v
en no
arguments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
M
e
r
ge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2006-12-20
J
u
n
io C
Haman
o
GIT 1
.
4
.
4
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
J
u
ni
o
C Hamano
simplify incl
u
sio
n
of system
head
e
r files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
co
n
f
i
g
_
r
ena
m
e_section: fix F
I
LE* leak
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Ju
n
io
C
Hamano
f
i
x populat
e
-
f
ilespec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Ha
m
ano
R
e
v
e
rt "
M
a
ke left-right automatic
.
"
commit
|
commitdiff
|
tree
2006-12-19
Junio
C Hama
n
o
Us
e
p
r
eprocess
o
r constants for environment var
i
ab
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
J
u
nio C H
a
mano
Do not
c
r
eate $G
I
T
_DIR
/
r
emo
t
es/ direc
t
o
ry anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C
H
amano
Merge branc
h
'jc/test-clone' int
o
jc/clon
e
commit
|
commitdiff
|
tree
2006-12-19
Jun
i
o
C Ham
a
n
o
Revert "fix
t
ests
u
ite: make
sure t
h
ey use templ
a
tes
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
Junio C Ham
a
no
blame: -b (blame
.
blankbo
u
nda
r
y) and --ro
o
t (blame
.
showroot)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Teach
git-bran
c
h to d
e
lete tracki
n
g
branches wit
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
J
u
nio
C
Hamano
fix testsuite: ma
k
e sure they use te
m
plate
s
freshly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C H
a
man
o
rerere
:
fix bre
a
kage of resolving
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C H
a
mano
racy-
g
it: docu
m
entat
i
o
n
updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C H
a
mano
show-ref: fix --exclude-existing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
Ham
a
no
parse-re
m
ot
e
:
:expand_r
e
fs_wildcard()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
sh
o
w-
r
ef: f
i
x
-
-
verify
--hash=leng
t
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
n
i
o
C
Hamano
show-ref: fix --quiet --
v
eri
f
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C
H
a
m
ano
Merge branch 'jc
/
bla
m
e-boundary'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Merge
b
ranch
'j
c
/reflog'
(
early
p
art)
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Mer
g
e branch '
j
s/branc
h
-config'
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio
C
Ha
m
ano
Merge branch 'jn/w
e
b' (early part)
commit
|
commitdiff
|
tree
2006-12-18
Ju
n
io C Hamano
avoid
accessing
_
a
l
l_ loo
s
e refs in git-show-ref -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ha
m
ano
git-fe
t
ch: A
v
oid reading p
a
cked refs over and
over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
T
each show-branch
h
ow to show ref-log
data
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Make left-right automatic
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C Hamano
T
e
ach
all of l
o
g fami
l
y --left-ri
g
ht outpu
t
.
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
Juni
o
C
H
ama
n
o
markup
f
ix in s
v
ni
m
port do
c
umentat
i
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
u
nio
C
H
a
mano
Fix m
i
s-mark-
u
p in
git-merge-file
.
txt documen
t
a
t
io
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C H
a
mano
Fix check_f
i
l
e
_directory_conflict(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
u
nio C Hamano
git-add:
remove conflicting
e
ntry when addi
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
unio C H
a
mano
update-index:
ma
k
e D/F
c
onflict e
r
r
or a bit more ver
b
o
se
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
git-cl
o
ne: lose the tradit
i
onal 'no-separate-r
e
m
ote
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Haman
o
gi
t
-
clone: lose the artif
i
cial "first" fetch re
f
s
p
ec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C H
a
m
ano
git-pull: refuse default merge wit
h
out
b
ran
c
h
.
*
.
merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Juni
o
C Hama
n
o
git-clone
:
use
wildc
a
r
d s
p
e
cification
for trackin
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Ha
m
ano
m
e
rge: give a bi
t
prettier merge me
s
sage to "merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
Merge
branch 'js
/
show'
commit
|
commitdiff
|
tree
2006-12-14
Ju
n
i
o
C Hamano
g
it-
r
eset [--mix
e
d] <tree> [--] <paths>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C
H
a
man
o
git-res
e
t: make
i
t work fr
o
m
w
i
thi
n
a su
b
dire
c
to
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
u
nio
C
Hamano
git-fetc
h
: make it work from within a s
u
bdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Juni
o
C
Hama
n
o
M
e
rge branch '
m
aint'
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
U
p
date git
-
diff documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C Hamano
M
e
rge branc
h
'jc/diff--cached'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
git
-
svn: al
l
ow both
diff
.
c
ol
o
r and
color
.
diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hama
n
o
config
docu
m
entation
:
g
r
oup color items together
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o
C
Hamano
git
-
blame: s
h
ow li
n
es att
r
ibuted to boundary commits
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
mano
Merge br
a
nch 'jc/r
e
ad-tree-ignore'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
Merge bra
n
ch 'ew/rerere'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge
branc
h
'np/ad
d
commit'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Haman
o
Merge
bran
c
h 'lh/br
a
nch-rena
m
e'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Mer
g
e branch '
j
c
/commit-carefu
l
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'ap
/
clone-origin'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
Merge branch 'jc/num
s
t
at'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Merge
b
ranch 'rr/
c
vs
e
xportcommit'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o
C
Hamano
Merge branch 'ap/
b
r
anch'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
branch --color: c
h
a
n
g
e
defau
l
t color selection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Haman
o
Merge
b
ranch 'js/merge'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C H
a
mano
s
e
nd-pack: tighten
c
hecks for remote names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
g
it-push: accept tag <tag> as
a
dvertised
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C H
a
m
a
n
o
spurious
.
sp in man
p
ages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git merge: r
e
wo
r
d failure
m
essage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C
Hamano
Revert "git-diff: Introduce
--index and dep
r
ecate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
J
u
n
io C Hamano
g
it-pus
h
: d
o
cument remo
v
al of remote ref
wi
t
h :<dst
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Mer
g
e branch 'mas
t
er' into js/merge
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
Me
r
ge b
r
a
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
add
te
s
t case
f
or
recur
s
ive
merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio
C Ha
m
ano
d
i
ff --numstat: show binar
y
wi
t
h '-' to match "a
p
p
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Juni
o
C
Hama
n
o
shortlog: fix
s
e
g
fau
l
t
on empty auth
o
rname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C
Ha
m
ano
shortlog: r
e
m
ove "[PATCH]
"
prefix
from s
h
ortlo
g
output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
Me
r
ge branch
'
mai
n
t
'
commit
|
commitdiff
|
tree
2006-12-10
Junio C Ha
m
ano
git-commit: allow --
o
nly t
o
lose
wh
a
t was staged ea
r
lier
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
J
unio C
H
amano
Docu
m
entation/
g
i
t
-commit: r
e
wri
t
e t
o
make it more end
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Junio C H
a
ma
n
o
git-rerere: add 'gc' command
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Junio C Hamano
F
i
x
p
e
r
l
/ build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Junio C
H
amano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2006-12-06
J
u
nio C H
a
mano
g
i
t-m
e
rge: fix "fi
x
confusion
between t
a
g and
branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
unio
C Haman
o
git-
m
erge: squel
c
h
n
eedless
error message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next