repo.or.cz
/
git
/
fastimport.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Revert "git-pull: refuse default merge without branch.*.merge"
2006-12-22
Junio C
H
amano
Revert "git-pull: re
f
use d
e
fault me
r
ge wit
h
out branch
.
.
.
commit
|
commitdiff
|
tree
2006-12-21
Junio C Hamano
Merge branch 'ew
/
sv
n
-pm'
commit
|
commitdiff
|
tree
2006-12-20
Jun
i
o C Haman
o
diff doc
u
m
enta
t
i
o
n: mostly talk abo
u
t <commit>
commit
|
commitdiff
|
tree
2006-12-20
J
unio C
H
amano
Merge branch 'jc/l
e
f
t
right'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
M
er
g
e bra
n
ch '
j
c
/blame'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
Merge branch 'jc/bra
n
ch-remove-remote
'
commit
|
commitdiff
|
tree
2006-12-20
Junio
C
H
amano
Merge b
r
a
n
ch 'jc/c
l
o
n
e
'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
compa
t
/inet_ntop
:
d
o not use u
_
int
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
git-add: e
r
ror
out when given
n
o ar
g
um
e
nts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2006-12-20
J
u
ni
o
C
Hamano
GIT
1
.
4
.
4
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
sim
p
lify inclus
i
on of system header f
i
les
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio
C Hamano
config_rename_section: f
i
x
F
IL
E
*
l
e
ak
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Ju
n
io C Ham
a
n
o
fix populate-
f
iles
p
ec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Juni
o
C Hamano
Reve
r
t "Make left-r
i
ght a
u
tomatic
.
"
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hama
n
o
Use preprocessor constan
t
s for environm
e
nt variable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio
C
H
amano
Do
n
o
t c
r
eate $GIT_DIR/remotes/ d
i
rector
y
anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio
C
H
amano
Merg
e
b
r
a
nch 'jc/test-clone'
i
nto jc
/
c
l
on
e
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
R
e
v
e
rt "
f
i
x
t
e
st
s
uite:
m
ake sure t
h
e
y use te
m
plate
s
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
Juni
o
C
Hamano
blame: -b
(
blame
.
b
lankbou
n
da
r
y) and
--root
(
blame
.
showroot)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C
H
a
m
ano
T
ea
c
h g
i
t
-
branch to del
e
te tracki
n
g br
a
n
c
h
e
s with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
fix testsuite: mak
e
sure they use templates fr
e
s
h
ly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Haman
o
rerere:
fix breakage of re
s
olv
i
ng
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C
H
a
m
a
no
rac
y
-git
:
do
c
ument
a
tion upda
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
s
h
ow-ref: fix
--
e
xclud
e
-
e
x
isting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C
H
ama
n
o
p
arse-remote::expand_refs_wildcard()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
show-re
f
: fix
--verify
--hash=length
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
Hamano
show-ref: fix --quiet
--verif
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ham
a
no
M
e
rge branc
h
'
jc/bl
a
m
e-bound
a
r
y
'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Merge branch 'jc/reflog' (early part
)
commit
|
commitdiff
|
tree
2006-12-18
J
u
n
i
o
C Hamano
Merge br
a
nch 'js/branch-config'
commit
|
commitdiff
|
tree
2006-12-18
Junio
C Hamano
Merge b
r
anch 'jn/web' (early
p
art)
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
a
v
oi
d
ac
c
essing _all_ l
o
ose refs in git-s
h
ow-ref -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
git-fetch: Avoid
readin
g
packe
d
refs over and ove
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Teach s
h
ow-bra
n
c
h
how to
s
how
ref-log data
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Make le
f
t-right automatic
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
i
o
C Hamano
Teach all o
f
log
f
amily --left-
r
ight out
p
ut
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
rev-list --le
f
t-right
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
u
nio C
Hamano
m
arkup fix
in svn
i
mport d
o
cumentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
H
amano
Fix m
i
s-mark-u
p
in
g
it-merge-file
.
t
x
t documen
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Fix c
h
e
c
k_file_di
r
ec
t
o
ry_con
f
li
c
t()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io C
H
aman
o
g
i
t
-
add: remov
e
conflictin
g
entry when adding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
u
p
date-
i
ndex:
make D/F
co
n
flict error a bit more verbose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Ha
m
ano
git-clone:
lose th
e
traditiona
l
'n
o
-separate-re
m
ote
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
git-clone:
l
ose t
h
e
a
rtif
i
ci
a
l
"fi
r
st" fet
c
h refs
p
e
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Ju
n
i
o C
H
amano
git-pu
l
l: refuse default merge
w
itho
u
t branch
.
*
.
mer
g
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hama
n
o
git-clone: use wildcard
s
pecification for t
r
ac
k
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
merge:
g
ive a
b
it pre
t
t
i
e
r merge mes
s
age to "merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Ju
n
io C H
a
m
an
o
M
e
rge
b
ranch 'js/show'
commit
|
commitdiff
|
tree
2006-12-14
Jun
i
o C Hamano
git-reset [--mixed] <tree> [-
-
]
<paths>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
u
n
i
o
C Hama
n
o
git-re
s
et: ma
k
e i
t
w
o
rk
f
rom
w
it
h
in a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Ju
n
io C Hamano
git-fetch:
m
a
k
e i
t
work from within a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hama
n
o
M
e
r
g
e br
a
nch 'maint'
commit
|
commitdiff
|
tree
2006-12-14
Junio C Ham
a
no
Update git-dif
f
do
c
umentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
uni
o
C H
a
mano
M
er
g
e branch '
j
c/diff--ca
c
hed'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git
-
s
v
n:
allow both
d
iff
.
color and c
o
lor
.
di
f
f
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
confi
g
d
oc
u
mentation: group color
items t
o
g
e
t
h
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hama
n
o
git-blame: show lin
e
s attribut
e
d to b
o
undary commits
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C
H
a
mano
Merge branc
h
'jc/read-tr
e
e-igno
r
e'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Haman
o
Merge
b
ra
n
c
h
'ew/re
r
ere'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
M
erg
e
branch 'np/addcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Me
r
g
e
branch
'lh/branch-
r
ename'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C
H
amano
M
erge branch 'jc/commit-c
a
reful'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C H
a
mano
Merge branch 'ap/clone-ori
g
in'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
Merge branch
'jc/numst
a
t'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o
C Hamano
Mer
g
e branch 'rr/cv
s
exp
o
rtco
m
mi
t
'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
Merge branc
h
'ap/bran
c
h'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Haman
o
b
ranch --co
l
or: change def
a
ult c
o
lor sel
e
ctio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Ham
a
no
Merge branch 'js/merge'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
se
n
d
-pack: tighten checks for
r
emote names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio
C
Hamano
git-pus
h
:
accep
t
t
ag
<
tag> as advertised
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
spuri
o
u
s
.
sp in manp
a
ges
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
git merge: reword failure mes
s
age
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hamano
R
e
vert "
g
it-diff: Introduce --i
n
dex and deprecate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git-pu
s
h
:
doc
u
ment removal
o
f 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 'maste
r
' into js/me
r
ge
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
m
ano
add test case f
o
r recursive
m
erge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
diff --numstat: show bina
r
y
with '-' to match
"
app
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
unio C
Haman
o
shortlo
g
: fix segfault on empty authornam
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Ha
m
ano
shortl
o
g
:
remov
e
"[P
A
TCH]
"
p
ref
i
x
f
rom shortlog
o
utput
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Juni
o
C
Hamano
Merge bran
c
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2006-12-10
J
uni
o
C Ham
a
no
g
it
-
co
m
m
it: allow --only to lose
w
hat was s
t
a
ge
d
earlier
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
Ju
n
io C Hamano
Docume
n
tatio
n
/git-commit
:
re
w
r
i
te
to
m
ake it m
o
re en
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Junio C Hamano
g
i
t
-rerere
:
ad
d
'gc'
c
o
mmand
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Junio C Haman
o
Fix per
l
/ build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Junio
C
Hamano
Merge branch
'mai
n
t'
commit
|
commitdiff
|
tree
2006-12-06
J
unio C Hamano
git-merge: fix "fix c
o
nfusion betw
e
en tag and branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
git-mer
g
e: squelch needless
e
rror mes
s
ag
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio
C
Hamano
Me
r
ge
commit
|
commitdiff
|
tree
2006-12-06
J
u
nio
C Hamano
M
erge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2006-12-06
Junio C H
a
mano
git
-
rese
t
to r
e
m
ove "
$
GIT_DIR/MERGE_MSG"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
unio C Hamano
read-tree
:
docu
m
ent --exclude
-
per-d
i
rector
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Juni
o
C Hamano
Loosen "working file wi
l
l be lost"
c
heck
i
n Porcelain-
i
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
r
ead-tree: further loos
e
n "working file w
i
ll be lost
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Junio C
H
amano
Merge
b
ranch
'
ma
i
n
t
'
commit
|
commitdiff
|
tree
2006-12-04
J
u
nio C H
a
mano
un
p
a
c
k-tree
s
:
mak
e
sure "df_conflict
_
entr
y
.
name"
is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Juni
o
C H
a
man
o
rece
i
ve-pack: do not in
s
ist on fast-
f
orward o
u
tside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Jun
i
o
C Hama
n
o
merge-recursive: use xdl_merge()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next