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 'jc/clone'
2006-12-20
Juni
o
C Hamano
M
er
g
e
branch 'jc/clone'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
compa
t
/inet_ntop: do not use u_int
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Juni
o
C Hamano
g
it-add:
error out when g
i
ven no ar
g
ume
n
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio
C
H
a
m
an
o
Merge branch
'maint'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
G
I
T 1
.
4
.
4
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Ju
n
io C Ham
a
no
simplify inclusion
of
system head
e
r
f
il
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Ham
a
no
config_rename_se
c
tion:
f
ix F
I
LE*
l
eak
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Ju
n
io
C
Ha
m
ano
fix populate-filespec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Ha
m
a
n
o
Use prep
r
ocessor c
o
nstan
t
s for environmen
t
variable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Do not create
$GI
T
_DIR/remotes/
directory anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
J
unio C
H
a
man
o
M
erg
e
branch
'jc/test-clone'
i
n
t
o jc/clone
commit
|
commitdiff
|
tree
2006-12-19
Junio C
Ham
a
no
Revert "fi
x
testsuite: make sure they use templates
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
fix testsuite
:
m
a
ke sure the
y
use
t
emplates freshly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
J
u
nio
C
Hamano
rerere: fix break
a
ge o
f
resolving
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
unio C Hamano
racy-git: doc
u
m
en
t
a
tion
u
pdates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ha
m
ano
s
h
o
w-ref: fix
--exclud
e
-ex
i
sti
n
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o
C
Hama
n
o
parse
-
rem
o
t
e
::e
x
pand_refs_wil
d
card()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Ju
n
io
C Hamano
show-r
e
f: fix --verify --hash=length
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Ju
n
io C
H
ama
n
o
sho
w
-ref: fi
x
--
q
u
i
et --
v
erify
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ham
a
no
Merge branch 'jc/blame-bo
u
ndary'
commit
|
commitdiff
|
tree
2006-12-18
J
unio C
H
ama
n
o
Merge br
a
nch 'jc/reflog' (early part
)
commit
|
commitdiff
|
tree
2006-12-18
Ju
n
io
C
Hama
n
o
Merge bra
n
ch
'
js/branch-config'
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
Haman
o
Merg
e
bra
n
c
h 'jn/web
'
(early part)
commit
|
commitdiff
|
tree
2006-12-18
J
u
n
io C Hamano
avoid acces
s
i
n
g _all_ loose refs in git-show
-
ref -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C H
a
mano
git-fetch: Avoi
d
rea
d
in
g
packed
r
e
fs ove
r
a
nd over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Teach sh
o
w-branch how to show ref-log data
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
unio C Hamano
markup fix in svnimport do
c
umentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Fix mis-mark-up i
n
git-merg
e
-file
.
tx
t
documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
u
nio C Hamano
Fix check_file_
d
irectory_confl
i
ct()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
un
i
o C Hamano
git-add: rem
o
ve conflict
i
n
g
e
n
t
r
y when a
d
d
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
u
p
d
a
t
e
-in
d
e
x
: make D/F conflic
t
e
rror
a b
i
t more ve
r
bose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Haman
o
git-
c
lone: lose the traditional
'no-sep
a
rate-remot
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
gi
t
-clone: l
o
se
the artif
i
cial "first" fetch refs
p
e
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hama
n
o
git
-
pull: refuse
d
efault merge
w
it
h
o
u
t
branch
.
*
.
merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
g
it-clone: us
e
wildcard specifica
t
io
n
for
t
ra
c
king
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
unio C
H
a
mano
merg
e
:
g
ive a bit pret
t
ier merge m
e
ssa
g
e to "mer
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C H
a
m
ano
Mer
g
e
branch
'
js/show'
commit
|
commitdiff
|
tree
2006-12-14
Junio C Ha
m
an
o
git-reset [-
-
mixed] <tree> [-
-
] <pat
h
s>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
unio C Ha
m
ano
gi
t
-reset: make it wo
r
k from within a su
b
dir
e
c
t
or
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Juni
o
C
Hamano
git-fetch: make it work
fr
o
m within a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
Updat
e
git-dif
f
d
ocumentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
Mer
g
e
bra
n
ch '
j
c/diff--
c
ach
e
d'
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
mano
git-svn:
a
l
low b
o
t
h d
i
ff
.
color
and col
o
r
.
diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
config documentation
:
g
rou
p
color items
t
ogether
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
g
it-
b
lame: s
h
ow lines a
t
tributed to
b
oundary commits
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
Merge b
r
anch 'jc/read-tr
e
e-ignore'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
a
m
ano
M
e
r
g
e b
r
anch 'ew/rerere'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C Hamano
Merge bran
c
h 'np/a
d
dcommit'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
i
o
C Hamano
Merge branch 'lh/branch
-
r
e
name'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hamano
Merge
b
ra
n
ch 'jc/co
m
mit-careful
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merg
e
b
r
anch 'ap/clo
n
e-
o
rigin'
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
mano
Merg
e
branch 'jc/
n
u
mstat'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
Mer
g
e branch 'rr/
c
vse
x
portcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
H
amano
Merge branch 'ap/branch
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
branc
h
--c
o
l
or: change
defaul
t
colo
r
s
election
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hamano
Merge bran
c
h 'j
s
/merge'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C H
a
man
o
send
-
pa
c
k: tigh
t
en c
h
ecks f
o
r r
e
mote name
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
n
io C
H
amano
gi
t
-push: accept
t
ag
<
t
ag> a
s
advertised
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
sp
u
rio
u
s
.
sp in man
p
ages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
m
ano
git me
r
g
e
: reword fail
u
re m
e
ssage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Revert "git-di
f
f: Intro
d
uce --i
n
d
ex and de
p
recate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
M
e
rge b
r
anch 'maint
'
commit
|
commitdiff
|
tree
2006-12-13
J
u
n
i
o C
H
amano
git-push:
d
ocument
r
emoval of remote ref with
:
<dst
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o
C
Hamano
Merge
b
ra
n
c
h
'master' into js/mer
g
e
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Ha
m
a
no
Mer
g
e
branch
'
maint'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hama
n
o
add test case for rec
u
rsive
merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Ju
n
io C Hamano
diff --numsta
t
:
s
how binar
y
wi
t
h '-' to match
"apply
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio
C
H
amano
shortlog: fix segfault on empty a
u
t
h
o
rname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hama
n
o
shortlog:
remove "[PATCH]" pre
f
ix from shortlog outpu
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
Me
r
ge branch 'm
a
int'
commit
|
commitdiff
|
tree
2006-12-10
Junio C Ha
m
an
o
git-commit: al
l
ow --only
to lose
w
hat was st
a
ge
d
earlier
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
Junio C Ham
a
no
Documentation/git-commit: rewr
i
t
e
t
o make i
t
more e
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Junio C H
a
mano
g
it-rerere: a
d
d 'gc' comma
n
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
J
u
nio C Hama
n
o
Fix
pe
r
l/ b
u
i
l
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
J
un
i
o C
H
amano
M
e
rg
e
branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2006-12-06
Juni
o
C
Hama
n
o
g
it-mer
g
e
: fix "fix confusio
n
between tag
and branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Ha
m
ano
g
i
t-m
e
r
g
e: squelch
n
eedles
s
error message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o
C
Hamano
Merge
commit
|
commitdiff
|
tree
2006-12-06
J
u
n
i
o
C
Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2006-12-06
Junio C Ha
m
ano
git-reset to remo
v
e "$GIT_DIR/MERG
E
_
MSG"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o
C Hama
n
o
read-tre
e
:
d
ocument --exclude
-
pe
r
-directory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
L
o
os
e
n "wo
r
k
i
ng file
will b
e
lost"
c
heck in Porcelain
-
ish
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
unio C Hamano
re
a
d
-
t
re
e
:
f
u
r
ther loo
s
en "working
f
ile w
i
ll be l
o
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Junio C
Ham
a
no
M
erg
e
branch 'maint'
commit
|
commitdiff
|
tree
2006-12-04
Jun
i
o C Hamano
unpa
c
k-t
r
e
e
s: mak
e
s
ure
"
df_conflict_entry
.
name
"
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Jun
i
o C Ha
m
ano
receive-pac
k
: do no
t
insist on fast-forward outside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio
C Hamano
m
e
r
g
e
-re
c
ur
s
ive: use xdl_merge()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio
C Ha
m
ano
xmer
g
e: make retu
r
n value from xd
l
_me
r
ge
(
) m
o
re
usable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
J
u
n
i
o
C
Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
git-merge: fix
c
onfusi
o
n
b
etween tag an
d
b
ranch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Merge m
a
ster
.
ker
n
e
l
.
org:/pu
b
/scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2006-11-29
Junio C
Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2006-11-29
J
u
nio
C Haman
o
tutoria
l
: talk about user
.
nam
e
early and
don't start
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Juni
o
C Ham
a
no
Merge branch 'j
c
/glo
b
fetch'
commit
|
commitdiff
|
tree
2006-11-29
Junio
C Haman
o
M
e
rge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
Junio C
Hamano
g
i
t
b
lame -C:
f
ix
output
f
ormat tweaks when crossing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Ha
m
ano
cv
s
impo
r
t:
style
f
ixup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Merge branch 'js/shortlog'
commit
|
commitdiff
|
tree
2006-11-27
J
uni
o
C Hamano
M
e
rge bran
c
h
'
jc/push-delete-ref'
commit
|
commitdiff
|
tree
next