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
rerere: Fix removal of already resolved path.
2006-12-20
Ju
n
io C Hamano
Merge branch 'jc/bl
a
m
e'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
M
erge branch 'jc/branch-remove-re
m
ote'
commit
|
commitdiff
|
tree
2006-12-20
Junio
C
Hamano
Merg
e
branch 'jc/clone'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Ham
a
n
o
comp
a
t/inet_ntop: do not use u_int
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio
C Hamano
spurio
u
s
.
sp in manpages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C
H
am
a
no
git-ad
d
: er
r
or out when given no arg
u
ments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Jun
i
o
C
Hamano
revision: --skip=<n>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
Merge branc
h
'
m
a
int'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
GI
T
1
.
4
.
4
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hama
n
o
simplify inclusion
o
f sys
t
em
h
e
a
der fi
l
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Ha
m
ano
config_rename_
s
ect
i
o
n: f
i
x F
I
LE* leak
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
fix po
p
ul
a
te-
f
i
lespec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Revert "M
a
k
e left-r
i
g
h
t automat
i
c
.
"
commit
|
commitdiff
|
tree
2006-12-19
Junio C Ha
m
ano
Use
p
reprocess
o
r const
a
nts fo
r
e
nviron
m
ent va
r
iable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio
C Ham
a
no
Do not create
$
GIT_D
I
R/r
e
motes/ directo
r
y
anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C H
a
mano
Mer
g
e branch 'jc/te
s
t-clone'
i
nto jc/clone
commit
|
commitdiff
|
tree
2006-12-19
Junio
C
Ha
m
a
no
R
e
vert "fix test
s
uite: m
a
ke
s
ure they use temp
l
at
e
s
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
J
unio C Hamano
git-
a
dd --interactive: hunk spli
t
ting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio
C
Haman
o
git-add --interactive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C
Hamano
bl
a
me: -b (b
l
ame
.
blankboundar
y
) and --root (blame
.
s
howr
o
ot
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
J
unio C Ha
m
ano
Teach git-branch to delete tracking bran
c
hes with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
J
u
nio C Hamano
f
i
x testsuit
e
: make sure they use
templates
f
r
e
s
hly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C H
a
mano
r
e
rere: fix bre
a
kage of resolving
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C Hamano
racy
-
git: docume
n
tation updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C Haman
o
show-r
e
f: fix -
-
exclu
d
e-existing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Ju
n
io C Hamano
par
s
e
-
remote::ex
p
and_refs_wildcar
d
()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C Hama
n
o
show-ref
:
fix --verify --hash
=
lengt
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
show
-
ref: fix --quiet --
v
e
r
i
fy
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Mer
g
e
b
ranch 'jc
/
blame-boun
d
ary'
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o
C
Hamano
Merge branch 'jc/reflog
'
(
early part)
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio
C Hamano
Merge branch
'js/branch-conf
i
g'
commit
|
commitdiff
|
tree
2006-12-18
Junio C H
a
m
ano
M
erge branch
'jn/web' (early part)
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
Ha
m
ano
a
v
oid
a
ccessing
_al
l
_
loose refs
i
n
git-
s
ho
w
-ref -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C Hamano
git-f
e
tch: Avoid reading p
a
cked refs over a
n
d o
v
er
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Teac
h
show
-
branch how to show ref-lo
g
dat
a
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
u
nio C Hamano
Mak
e
left-right
automatic
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
un
i
o C Hamano
Te
a
ch
a
ll of l
o
g famil
y
--left-rig
h
t out
p
ut
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io C Hamano
rev-list
-
-l
e
ft
-
righ
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
unio C H
a
mano
m
arkup fix in
s
vnimport document
a
t
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
Ham
a
no
Fi
x
mis
-
m
a
rk-up in git-m
e
rg
e
-
file
.
txt documentati
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
check_file_dir
e
ctory_
c
onflict()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
unio
C
Ha
m
a
no
git-add:
remove confli
c
ting
e
nt
r
y when adding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
u
p
date-inde
x
: make D/F
con
f
lict
err
o
r a bit
m
o
re verbose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Haman
o
git-clone: lose the traditional 'no-separ
a
te-remote
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C
Hama
n
o
git-clone: lo
s
e the artificial "
f
irst" fetch refspec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
u
nio C Hamano
git-pull
:
refuse
defau
l
t merge without bran
c
h
.
*
.
merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
g
i
t
-clone: use wil
d
card sp
e
cificat
i
on
for trac
k
in
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
merge: give a bit pr
e
ttier merg
e
messag
e
to "merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
u
nio C Hamano
Merge branch 'js/sh
o
w'
commit
|
commitdiff
|
tree
2006-12-14
Junio C H
a
m
a
n
o
git-re
s
e
t [--mix
e
d] <tree> [-
-
]
<paths
>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Haman
o
git-
r
e
s
e
t: m
a
ke it w
o
rk fr
o
m within a subdirec
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Ju
n
io C
H
ama
n
o
git-fetch
:
m
ake it wo
r
k from
within a subdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Juni
o
C Ham
a
no
Merge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2006-12-14
Junio C Ham
a
no
Update git-diff docume
n
t
at
i
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
Merge branch 'jc/d
i
ff--cached'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
git-svn: allo
w
both diff
.
c
o
l
or and color
.
diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Ha
m
ano
confi
g
docu
m
entation: gr
o
up color items together
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
g
i
t-blame: show lines
a
ttribu
t
ed
to boundary commits
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'jc/read-tree-ignore'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
aman
o
Merge branch '
e
w
/rere
r
e'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
Merge b
r
anch 'np/addcommit
'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Ham
a
no
M
e
rge branch
'
lh
/
bran
c
h-rename'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Ham
a
no
M
e
rge branch 'jc
/
commit-
c
areful'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch
'ap/c
l
o
n
e-origin'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C
H
amano
Merge
branch 'jc/numstat'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C
H
amano
Merge branch 'rr/c
v
sexportco
m
mit'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Ha
m
a
n
o
Merge branch 'a
p
/branch'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
branch --color: change default color s
e
lection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hamano
M
erge branch 'js
/
merge'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
sen
d
-pa
c
k: tigh
t
en checks f
o
r rem
o
te names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C
H
a
mano
git-push:
a
ccept tag <tag
>
as
advertis
e
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
no
spurious
.
sp in manpages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Ha
m
ano
g
i
t merg
e
: reword failu
r
e me
s
s
age
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Revert "g
i
t-
d
iff: Introduce --index and deprecate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
git-p
u
sh: docume
n
t
removal of remote
ref with :<dst
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
n
o
Merge b
r
anch '
m
aste
r
' into js/m
e
rg
e
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C Hama
n
o
Merge b
r
anc
h
'
m
ai
n
t
'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
a
dd test
case f
o
r
recursive
m
e
r
ge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Ha
m
ano
diff --num
s
tat: show binary with '-' to
m
a
t
ch
"
apply
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio
C Hamano
shortlog: fix segfault on emp
t
y author
n
ame
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Jun
i
o C
Hamano
shortlog: remov
e
"[P
A
TCH
]
" prefix
from
shortlog output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio
C
Hamano
M
er
g
e branch
'maint'
commit
|
commitdiff
|
tree
2006-12-10
Ju
n
io C Hamano
git-commit: all
o
w
--only to lose what w
a
s staged e
a
rl
i
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
J
u
nio
C Haman
o
Docum
e
ntation/git
-
commit: rewri
t
e to m
a
ke i
t
more end
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
J
u
nio C Ha
m
ano
git-rerere: add '
g
c
' command
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Junio C Hamano
Fix perl/ build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Junio C Hamano
Mer
g
e bran
c
h
'maint'
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o C Hamano
git
-
merge:
fix "fix confu
s
ion b
e
t
w
ee
n
tag and branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Juni
o
C Hamano
git-
m
erge: squ
e
l
ch ne
e
dl
e
ss error message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
u
nio
C
Ham
a
n
o
Merge
commit
|
commitdiff
|
tree
2006-12-06
Junio C
Hamano
Merg
e
br
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2006-12-06
J
u
nio C Hamano
gi
t
-reset to remove "$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
rea
d
-tree: document
--exclude-per-directory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o
C
Hamano
Loosen "work
i
ng
f
ile will be
lost" ch
e
c
k
in Porcelain-ish
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
r
ead-tree
:
further lo
o
sen "workin
g
file will be lost
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Juni
o
C H
a
mano
Merge
branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2006-12-04
J
u
n
io
C Ham
a
n
o
unpack
-
tre
e
s:
make su
r
e "df_conflict_entry
.
name
"
is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Ju
n
io C Ha
m
ano
receive-p
a
ck
:
do not insist on fast-forward outside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Ham
a
no
merge-
r
ec
u
rsive:
u
se xdl_me
r
ge()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next