repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Allow branch.*.merge to talk about remote tracking branches.
2006-12-24
J
u
nio C Hamano
A
l
low branch
.
*
.
merge
t
o
t
alk about re
m
o
t
e
tracking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-24
Jun
i
o C Hama
n
o
Merge branch 'sb
/
me
r
ge-
f
riendly'
commit
|
commitdiff
|
tree
2006-12-24
Junio C Hamano
Merge branch 'js/rerere
'
commit
|
commitdiff
|
tree
2006-12-23
J
unio C
H
a
m
ano
git-tag
:
lose exit after
die
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Jun
i
o C Hamano
R
e
ally fix headers fo
r
_
_FreeBSD__
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
J
u
nio C Hamano
Do not sup
p
o
rt "parti
a
l URL
s
horthand" any
m
o
re
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
defa
u
l
t
p
ull: forget
ab
o
ut "newbie protecti
o
n"
f
or
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Juni
o
C
Hamano
merge and reset: adjus
t
for "reset -
-
hard" m
e
ss
a
ges
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Ju
n
io C Ham
a
no
commit-tree: do
n
ot
ov
e
r
f
low
M
AXPARENT
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
_XOPEN_
S
O
U
R
C
E probl
e
m
a
l
s
o exists on FreeBSD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Haman
o
parse-remote: m
a
rk all refs n
o
t for merge only when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Ham
a
no
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
Re
v
ert "gi
t
-pull: ref
u
s
e default merge witho
u
t branch
.
.
.
commit
|
commitdiff
|
tree
2006-12-21
J
u
ni
o
C Hamano
Merge br
a
nch
'e
w
/svn-
p
m'
commit
|
commitdiff
|
tree
2006-12-20
Junio C
H
amano
diff do
c
umentati
o
n
: mostly talk
a
bout <com
m
it
>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
Merge
b
ran
c
h 'j
c
/
l
eftri
g
ht'
commit
|
commitdiff
|
tree
2006-12-20
J
u
nio C Haman
o
M
erge branch 'jc
/
blame'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
Merge b
r
anch 'jc/branc
h
-remove-
r
emote'
commit
|
commitdiff
|
tree
2006-12-20
Junio C H
a
man
o
Merge
b
r
anc
h
'jc/clone'
commit
|
commitdiff
|
tree
2006-12-20
J
u
n
io C
Hama
n
o
compat
/
inet_ntop: do
not use u_int
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
J
u
nio C Hamano
spurio
u
s
.
sp in ma
n
p
ages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Ju
n
io C Ham
a
no
git-ad
d
: error ou
t
when give
n
no argum
e
nts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-20
Juni
o
C Ham
a
no
GIT 1
.
4
.
4
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
J
unio C Hamano
simpl
i
fy in
c
lusion
of system header fil
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Juni
o
C Hamano
co
n
fig_rename_sect
i
o
n
: fix F
I
LE* leak
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio
C
H
aman
o
f
i
x populate-f
i
le
s
pec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
J
u
nio
C Hamano
Revert "Make
l
e
f
t-rig
h
t au
t
omatic
.
"
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Use pre
p
r
o
c
essor constan
t
s for en
v
ironment
var
i
able
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Do not cr
e
a
te $GIT_D
I
R/remo
t
e
s
/ director
y
anymor
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Merge branch 'jc
/
test
-
cl
o
ne'
i
nto jc/clone
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Rever
t
"fix testsuite: m
a
k
e
s
u
r
e they use templa
t
es
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
J
unio
C
Hamano
blame
:
-b
(
b
l
a
me
.
blankb
o
u
n
dar
y
)
a
nd --root
(blame
.
showroot)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hama
n
o
T
ea
c
h
g
it-b
r
anc
h
to delete trac
k
ing branches with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
J
u
nio C Ha
m
ano
fix
t
estsuite: make sure
t
h
e
y
use templat
e
s
freshly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
J
un
i
o C Hamano
r
ere
r
e
: fix breakage of re
s
olving
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o C Hamano
racy-
g
i
t: documentation updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C
Hamano
s
how-ref: fix --exclude-existing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
parse
-
remote:
:
exp
a
nd_
r
efs_wildc
a
rd()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Ju
n
io C Hamano
sho
w
-r
e
f: f
i
x
--verify --ha
s
h=length
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o
C
H
a
m
an
o
s
how-ref: fix --quiet --v
e
rify
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o C Hamano
Merge branch
'
j
c
/blame-b
o
undary'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
M
e
rge
b
ranch 'jc
/
reflog' (early
part)
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C
H
amano
Merge branch 'js/
b
ranch-config'
commit
|
commitdiff
|
tree
2006-12-18
Ju
n
i
o
C
H
amano
Merge b
r
a
n
c
h
'jn/
w
eb' (ea
r
ly part)
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
a
void accessin
g
_all_ loose refs
i
n gi
t
-show-
r
ef -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C H
a
mano
git-fetch: Avoid rea
d
ing
packed
refs over and over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Teach
s
h
ow-branch how t
o
show ref-log
d
a
ta
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Jun
i
o C
Ha
m
ano
M
ake l
e
ft-right aut
o
matic
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
u
nio C Ha
m
a
no
Teach
al
l
of log f
a
m
i
ly --left-right outpu
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Jun
i
o C H
a
m
a
no
rev-list --l
e
f
t-right
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Ha
m
a
n
o
mar
k
up
f
ix in svnimpo
r
t documentatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Fix
m
i
s-mark-up in
g
i
t-merg
e
-
f
i
l
e
.
txt documen
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io C Hama
n
o
Fix check_file_directory_conflict()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io
C
Ha
m
ano
git-add: remo
v
e conflicting en
t
ry w
h
e
n a
d
ding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
upd
a
te-index: make D/
F
c
o
nf
l
ict e
r
ror
a
b
i
t more v
e
r
bose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
git-clone:
los
e
the t
r
a
dition
a
l 'n
o
-separate-remote
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C
Hamano
git-clone: lose th
e
a
r
t
i
ficial "first" fetch refspec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Juni
o
C Ham
a
no
g
i
t-
p
ul
l
:
r
efus
e
default
m
erge
with
o
ut branch
.
*
.
merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Ju
n
io C Hamano
git-clon
e
: use wildc
a
rd
specification for tracking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio
C Hamano
m
e
r
ge: give a bit pret
t
ier
m
erge message
t
o
"merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
u
ni
o
C Hamano
M
e
r
g
e branch 'js/s
h
ow'
commit
|
commitdiff
|
tree
2006-12-14
J
u
nio C
H
amano
git-
r
eset [--m
i
x
ed] <tre
e
>
[--] <paths>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Ju
n
io C H
a
mano
git-reset: make it work from withi
n
a subd
i
rectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Ju
n
io C Ham
a
no
g
i
t-fetch: ma
k
e it w
o
rk from
within
a
subdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Ham
a
n
o
Merg
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2006-12-14
Junio C H
a
mano
U
pdate git-d
i
ff doc
u
ment
a
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
Merge
branch 'jc/
d
iff--cached'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
i
o
C Hamano
git
-
svn
:
allow
both
diff
.
color and color
.
diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hamano
co
n
fi
g
d
ocumentation: group color it
e
ms toget
h
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Ha
m
ano
git-bl
a
me: show
l
ines attributed to boundary commits
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branc
h
'j
c
/
r
ead
-
tr
e
e-ignore'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
ano
Merge branch 'ew
/
rerere'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
Merge branch
'
np/addcom
m
it'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C
H
amano
M
e
r
g
e branch 'lh/branch-rename'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
i
o C Hama
n
o
Merge bra
n
ch 'j
c
/commit-care
f
ul
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'ap/c
l
one-origin'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'jc/
n
u
mstat'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge
br
a
n
c
h 'rr/c
v
sexportcommit'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio
C Hamano
M
erge
b
r
a
nch
'
ap/b
r
anch
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
branch --color:
change defaul
t
c
o
lor
s
electi
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hama
n
o
Merge branch '
j
s/merge'
commit
|
commitdiff
|
tree
2006-12-13
J
uni
o
C
Hamano
sen
d
-
pack: tighten checks for remote names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
mano
git-push: accept
tag <tag>
a
s advertised
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C
H
amano
spurious
.
s
p
in manpages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hamano
git
merg
e
: rewor
d
failure me
s
sage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Rever
t
"
git-dif
f
:
I
ntroduce --index
a
nd de
p
recat
e
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Mer
g
e branch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
git-push: document removal of remote ref
with
:<dst
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Merge bra
n
ch 'mas
t
er' into js/merge
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2006-12-13
J
unio
C Hamano
add test case
for re
c
ursiv
e
me
r
ge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
diff --numstat: sho
w
binary
w
i
th '-' to match "apply
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Ju
n
i
o
C H
a
mano
shortlog: fix s
e
gfa
u
l
t
o
n
empty aut
h
orna
m
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hama
n
o
short
l
og: remove "[PAT
C
H]" prefix from shortlog ou
t
put
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-10
Junio C Ha
m
ano
git-commit: allo
w
--only
to l
o
s
e
w
h
at was
staged earlier
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
Junio
C H
a
mano
Documentation
/
git-commit: rewrite to make it m
o
re end
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Junio
C Hama
n
o
git-rerere:
ad
d
'
g
c' command
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Junio C Hama
n
o
Fix perl/
b
uild
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next