repo.or.cz
/
git
/
mergetool.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jn/conf'
2006-08-13
Junio C Ha
m
a
no
M
e
rge branch 'jn/con
f
'
commit
|
commitdiff
|
tree
2006-08-13
J
u
nio
C
Hamano
Merge bran
c
h
'j
c
/
g
rep'
commit
|
commitdiff
|
tree
2006-08-13
Jun
i
o C
H
am
a
no
Merge br
a
nch 'mk/ren
a
m
e'
commit
|
commitdiff
|
tree
2006-08-13
Jun
i
o C Hamano
Merge branch 'ml/p
a
ger'
commit
|
commitdiff
|
tree
2006-08-13
Junio C Hamano
GIT 1
.
4
.
2
commit
|
commitdiff
|
tree
2006-08-13
Junio C Hamano
Merge g
i
t://
g
it
.
kernel
.
org/p
u
b/scm/gitk/gitk
commit
|
commitdiff
|
tree
2006-08-13
Ju
n
io C Haman
o
t/t4013
:
f
i
x futzing with the version string
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-13
Ju
n
io C H
a
mano
Better error me
s
sage when we a
r
e unable to lock the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-13
Jun
i
o
C Ham
a
no
git-am
:
give bett
e
r
diagnostics when the patch does
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-12
Junio C Hama
n
o
Me
r
ge branch 'rj/header'
commit
|
commitdiff
|
tree
2006-08-12
Eric Wong
git-svn: split the path from the
u
rl c
o
rrectly
w
ith
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-12
Junio C Hamano
git-grep: show
pa
t
h
na
m
es relati
v
e to the
c
urrent directory
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-12
Junio C H
a
mano
git
-
sh-setup: do not use repo-config
t
o
tes
t
the git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-11
Eri
c
Wong
git-s
v
n:
b
ugfi
x
: allow SVN:: lib
u
sers to track
the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-11
Eric Wong
git-svn: correctly kill keyword
exp
a
nsion withou
t
munging
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-11
Rene S
c
h
arfe
d
rop l
e
ngth argume
n
t of has_extension
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-11
Junio C Hamano
Merge branc
h
'rn/push
-
dav'
commit
|
commitdiff
|
tree
2006-08-10
Rut
g
er Nijlunsi
n
g
A
dd Documentation/
h
owto/setup
-
git-ser
v
er-
o
v
e
r-http
.
txt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-10
Ren
e
Sch
a
r
f
e
git
-
v
eri
f
y-
p
ack: make
builtin
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-10
Junio C H
a
mano
Merge branc
h
'master' into mk/rename
commit
|
commitdiff
|
tree
2006-08-10
Rene Scharfe
g
it-verify-pack: no need to count error
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-10
Rene Scharfe
git-ver
i
fy-pa
c
k: buffer overrun par
a
noia
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-10
Rene
S
c
harfe
git-veri
f
y-
p
ack: free pack after use
a
n
d
a
c
lean
u
p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-10
Rene Scharfe
git-verify-pack:
g
et rid of while loop
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-10
Rene
S
charfe
git-
v
erify
-
p
ack: insist o
n
.
idx extension
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-10
Rene
Scharfe
git-v
e
ri
f
y-pack: more careful path han
d
ling
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-10
Rene Scharfe
git-verify-pack: show usage
when
n
o pack was specified
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-10
R
e
ne
S
ch
a
rfe
Add
has_extension()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-10
Ju
n
io C Hamano
built
i
n-apply: remove unused increm
e
nt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-10
Junio C
Hamano
Fix g
i
t-di
f
f A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-10
Juni
o
C Hamano
comb
i
ne
-
diff: use co
l
or
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-10
R
u
tger Nijlunsing
http
-
p
u
s
h: Make WebDAV wo
r
k wit
h
(broken?) default
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-10
Junio C Haman
o
g
i
t-apply: applying a patch
t
o make a symlink shorter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-09
J
uni
o
C
Hamano
allo
w
di
f
f
.
renamelimit to be se
t
r
e
g
a
rdless of -M/-C
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-09
Junio C
Hama
n
o
make --find-c
o
pies-harder imply -C
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-09
Junio
C
Ham
a
no
find_uniq
u
e_abbrev(
)
with l
e
n
=
0 s
h
ou
l
d n
o
t abbreviate
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-09
Junio C
H
a
m
a
n
o
check return val
u
e
from diff_setup_done
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-09
Junio C Hamano
Fix tutorial-2
.
html
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-09
Jakub Narebski
a
utoconf: Add
support for set
t
i
n
g CU
R
LDIR, OPENSSLDIR
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-09
J
uni
o
C Hamano
Docume
n
tation: git-status takes the s
a
me
options as
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-09
Jakub Narebski
autoconf: I
t
is
-
-without-python
,
no
t
--no
-
py
t
hon
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-09
Jonas F
o
nse
c
a
Update git-init-db
(
1) an
d
document
a
tion o
f
core
.
sharedRepository
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-09
Junio C Hamano
autoconf: clean tem
p
orary file
m
a
k
.
append
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-09
Jakub Nare
b
ski
autoc
o
nf: Move variab
l
e
s
whic
h
we always se
t
to
co
n
f
ig
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-08
J
un
i
o C
Hamano
Merg
e
bran
c
h 'master' i
n
to mk/ren
a
me
commit
|
commitdiff
|
tree
2006-08-08
Jak
u
b
N
arebs
k
i
autoconf: Improvements in
N
O_PYTHON/
P
YTHO
N
_
PATH handling
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-08
J
akub Narebski
autoconf: Error out on --with
o
ut-sh
e
ll and --withou
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-08
Jakub N
a
rebski
autoconf:
A
dd configure target
to main Makefile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-08
Jeff Kin
g
git-push
:
allow pu
s
h
i
ng from sub
d
irectories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-08
J
u
nio C
H
a
mano
GIT-VERSION-GEN: a
d
jus
t
for ancient
git
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-08
Junio C Hamano
bu
i
ltin-mv: fix us
e
of uninitiali
z
ed m
e
mory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-08
Junio
C
Hamano
debugg
i
ng: XMALLOC_PO
I
SON
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-07
Ry
a
n
Anderson
annotate: F
i
x
b
ug when parsing merges with
d
if
f
eri
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-07
R
yan And
e
rso
n
log-tree: s
h
ow_log() should respect t
h
e setting of
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-07
Michael Krelin
handle htt
p
s
:
/
/
p
r
otocol in git-clone
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-07
J
a
kub Na
r
ebski
autoc
o
nf:
U
nset NO_STH and NEED_STH when it
is det
e
cte
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-06
Junio
C
H
a
mano
Fix "grep -w"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-05
J
un
i
o C Hamano
Makefile: Cygwin
d
oes not seem to need NO_S
T
RLCPY
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-05
Ram
s
ay
J
ones
commit walker
s
: s
e
t
u
p
_i
d
ent() to reco
r
d cor
r
ect committ
e
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-05
Rams
a
y Jones
Allow config fil
e
to
specify Si
g
ned-off-
b
y
identity
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-04
Junio C
H
a
m
a
no
autoconf: NO_I
P
V6
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-04
Jakub
N
arebski
au
t
oco
n
f
:
S
et NEEDS_LIBICONV
unconditional
l
y if th
e
re
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-04
Junio C Ham
a
no
autoconf: f
i
x NEEDS_SS
L
_WIT
H
_CRYPT
O
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-04
J
u
nio C Hamano
Merge branch 'jc/c99'
commit
|
commitdiff
|
tree
2006-08-04
Jakub Narebski
Copy d
e
s
cription
o
f n
e
w build configurati
o
n variables
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-04
Jakub Nareb
s
ki
autoco
n
f
:
Typo cleanup, reordering etc
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-04
J
a
kub Narebski
au
t
oco
n
f: Ch
e
ck for ll hh
j z t
size specifiers introdu
c
ed
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-04
Johannes Schinde
l
in
Fix
cras
h
when GIT_D
I
R is invalid
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-04
Rene Scharfe
gi
t
-tar
-
t
ree: fi
x
minor
m
em
o
r
y le
a
k
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-04
U
w
e Zeisberger
Documen
t
rev-list's
o
ption --merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-04
Jun
i
o C Ham
a
no
git
.
c: Rename NEED
S
_PREFIX
t
o RU
N
_SETUP
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-04
Junio C Ham
a
no
builtins: Makefile clean-u
p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-04
Junio C H
a
man
o
Make git-checkout-in
d
e
x a bui
l
t
i
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-04
M
atthias
Kestenholz
Ma
k
e g
i
t
-
symb
o
l
ic-ref a
b
uilt
i
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-04
Matthias Kesten
h
olz
Make git-unpack-objects
a builtin
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-04
Matthias
K
estenholz
M
ake
git-pack-
o
bjects a b
u
iltin
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-04
Mat
t
hias Kestenholz
M
ake gi
t
-n
a
me-rev
a
builtin
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-04
Junio C Hamano
Further
c
lean-up
:
usage() vs die()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-04
Ramsa
y
All
a
n J
o
nes
Replac
e
some calls to die(u
s
a
g
e_str) with usage(usage_str)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-04
Ra
m
say A
l
lan Jone
s
Fixup command names in some usage
s
trings
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-03
Junio C Hamano
G
I
T 1
.
4
.
2-
r
c3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-03
Juni
o
C Hamano
Doc
u
m
e
ntati
o
n
/
gi
t
.
txt: link
git-svn and git-i
n
s
t
aweb
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-03
Juni
o
C
H
amano
M
erge
b
ranch 'jc/side
b
and'
commit
|
commitdiff
|
tree
2006-08-03
Ju
n
io C H
a
ma
n
o
sideba
n
d
: do
n
ot use color, just say "remote:
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-03
Junio C Hamano
S
ho
w
both blob na
m
es from "git diff
b
lob1
b
lob2"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-03
Junio C Hamano
d
i
ff
.
c: do not u
s
e path
n
ame comp
a
r
ison to tell
r
enames
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-03
Junio
C
Ham
a
n
o
Add
a couple of subdir
e
ctory t
e
sts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-03
J
u
nio C Hamano
r
ead-tree:
s
hado
w
ed va
r
iable
fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-03
Michael
fixed variable declarati
o
n in
g
i
t
k
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-03
Juni
o
C
Hamano
Fix "
g
it dif
f
blob1 blob2" showing the diff in r
e
verse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-03
Jaku
b
Nareb
s
ki
a
u
toconf: Ad
d
supp
o
r
t for setting
P
YTHON_PATH o
r
N
O_PYTHON
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-03
J
akub
N
ar
e
bski
autoc
o
nf:
M
ove site config
u
ration sec
t
i
on earlier in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-03
Ja
k
ub
Nare
b
ski
autoconf: Add sup
p
ort for se
t
ting
S
HELL_PATH and PERL_PATH
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-03
Junio C Ha
m
ano
C
y
g
w
in
needs NO_C99_
F
ORMAT??
?
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-03
Matth
i
a
s
Lederhofer
git-g
r
ep: document
-
-an
d
,
--
o
r, --not, (
a
n
d )
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-03
Matthias Keste
n
holz
use dec
l
arations from builtin
.
h f
o
r builtin co
m
mands
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-03
M
a
t
t
h
i
as Kes
t
enholz
Make git-repo-con
f
i
g a bui
l
tin
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-02
Matthias Keste
n
h
o
l
z
M
a
k
e git-pr
u
ne-pac
k
ed a buil
t
in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-02
Jef
f
King
gi
t
-annotate:
re
m
ove
e
x
t
r
a
n
e
ous d
e
bugging line
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-08-02
Jeff King
Documentation: co
n
vert uses of git-link
m
acro to gi
t
link
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next