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
Improved three-way blob merging code
2006-06-28
Johannes Schi
n
del
i
n
Save err
n
o in handle_alia
s
()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-25
Johanne
s
Schindelin
apply: replace NO_ACCU
R
AT
E
_
DIFF wit
h
--
i
naccurate-eof
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-25
Johannes Schind
e
lin
cvsi
m
p
ort: always set
$
ENV{
G
IT_INDEX_FILE} to
$index
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-24
Johannes Sch
i
ndelin
Teac
h
diff about
-
b and -w flags
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-23
Joha
n
nes Schin
d
elin
patch
-
id:
t
ake "commit" pr
e
fix as
w
e
l
l as "diff-t
r
ee
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
Jo
h
annes Schin
d
elin
git_conf
i
g: acce
s
s() retur
n
s 0 on success, not
>
0
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
J
ohannes
S
chindelin
repo-
c
onfig: Fix late-night bug
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
Johan
n
e
s
Schindelin
Read configur
a
tion also from $HOME/
.
g
itc
o
nfig
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
Johan
n
es Schindelin
Fix setting config variables w
i
th
a
n alternative GI
T
_CONFIG
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
Johannes Schindelin
Initialize lock_fil
e
struct to all zero
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-18
Jo
h
a
nnes Schindelin
dif
f
o
p
t
ions:
a
dd --c
o
lor
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-06
Johannes
S
chinde
l
in
I
f you have a config co
n
taining somethin
g
li
k
e
this:
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-02
Johannes Sch
i
ndelin
format-patch: resurrect extra headers f
r
om
c
o
n
f
ig
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-31
Joha
n
nes Schin
d
elin
se
n
d
-
email:
only 'require'
i
nste
a
d of 'use'
Net::SMTP
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-26
Joha
n
n
es Schind
e
lin
g
i
t
-
format-patc
h
--
s
tart-num
b
er <n>
commit
|
commitdiff
|
tree
2006-05-21
Johann
e
s Sc
h
in
d
elin
fmt-patch: S
u
pport --attach
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-21
J
ohannes Schindelin
diff fa
m
ily: add --c
h
eck option
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-07
Joh
a
nnes Sc
h
indeli
n
Fix cr
a
sh when re
a
ding t
h
e
empty tree
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-07
Johannes Schindelin
Fix users of pref
i
x
_p
a
th()
t
o
f
ree(
)
onl
y
when nece
s
sary
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-07
Johannes
Schindeli
n
Fix users
of
prefix
_
path() t
o
free() only
w
h
en
n
eces
s
ar
y
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-06
Johannes Schi
n
delin
fmt-patch: underst
a
nd old
<h
i
s
> notation
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Johannes Schindelin
repo-
c
onfig: trim white-space before comment
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Johan
n
es Schindelin
Teac
h
fmt-patch about --kee
p
-
subje
c
t
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Jo
h
annes Schi
n
delin
Teach fmt-p
a
t
ch ab
o
ut
--numbere
d
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Johan
n
es Schindelin
f
mt-pat
c
h: implement -o
<dir>
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Jo
h
annes Schindelin
f
mt-
p
atch: output file
n
a
mes
to
s
tdout
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
J
o
hannes Schindelin
Teach fm
t
-
patch to write
i
ndividual files
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
J
ohan
n
es Schindelin
builtin-
p
ush: --
a
l
l a
n
d -
-
tags _ar
e
_
e
x
p
licit refspecs
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-04
J
o
han
n
es S
c
hindelin
Add a conve
r
sion tool to migrate remote info
r
mat
i
on
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-04
Johannes Schindelin
f
e
tch,
pull: ask c
o
nfig for
r
emote informa
t
ion
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-03
Johannes Sc
h
i
n
d
elin
repo-config: deconvolute l
o
gics
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-03
Johannes Sc
h
indelin
r
epo
-
c
onfig: support --get-
r
egex
p
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
Johannes Sch
i
ndel
i
n
r
epo-config: trim white-
s
pace before comment
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
Joh
a
n
n
es S
c
hindelin
repo
-
config: fi
x
segfault with no argument
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
Johannes Schin
d
elin
fetch, pull: ask co
n
fig for remote information
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
Johannes
S
c
h
indelin
b
u
il
t
in-
p
ush: als
o
ask config
f
or remote information
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
Joha
n
nes Schinde
l
in
c
ach
e
-t
r
e
e
: re
p
lace a sscanf
(
) by two st
r
tol()
ca
l
l
s
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-30
Johannes Sch
i
n
delin
builti
n
-push:
r
es
u
r
rect parsi
n
g
of Pu
s
h: lin
e
s
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-16
Johann
e
s S
c
hindelin
page
r
: do
no
t
fork
a pager if PAGER is set to
e
mpty
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-16
Johannes Schind
e
l
in
diff-options: a
d
d --
p
atch
-
w
i
th
-
stat
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-13
Joha
n
nes Schind
e
l
in
diff-options: add --stat (take
2
)
commit
|
commitdiff
|
tree
2006-04-13
Johannes Sc
h
indeli
n
dif
f
-options: add --s
t
a
t
(ta
k
e 2)
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-05
Johanne
s
Schindelin
Fix c
o
mpile with ex
p
at, b
u
t
an old curl version
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-05
Jo
h
an
n
e
s
S
c
hi
n
delin
On some
platform
s
,
ce
r
tain hea
d
ers need to be included
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-05
Johann
e
s Schi
n
d
e
lin
cvsimport: use git-u
p
da
t
e-
r
e
f when
u
p
dating
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-03-27
Johannes Schindelin
Re
m
ove dependency on a fi
l
e named "
-
l
z"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-03-12
J
o
hannes Sch
i
ndeli
n
imap-send:
A
dd missing #include
for macosx
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-03-03
Johannes Schinde
l
in
Fix test case
f
or
s
ome sed
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-03-01
J
ohannes
Schindelin
War
n
abou
t
in
v
alid r
e
f
s
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-02-22
Johannes
Schindelin
Use Ry
a
n's git-ann
o
tate inste
a
d of jsannotate
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-02-22
J
o
han
n
es Schindelin
Fix
"gmake
-j"
commit
|
commitdiff
|
tree
2006-02-20
Jo
h
annes Schi
n
delin
Really ho
n
our NO_PYTHON
commit
|
commitdiff
|
tree
2006-02-20
Johannes Sc
h
inde
l
in
a
void mak
e
fil
e
override warni
n
g
commit
|
commitdiff
|
tree
2006-02-19
Johannes Schindel
i
n
Fix
e
s fo
r
a
ncient versions
o
f GNU
make
commit
|
commitdiff
|
tree
2006-02-19
Johannes Schi
n
delin
Op
t
i
onal
l
y w
o
rk without python
commit
|
commitdiff
|
tree
2006-02-18
Johannes Schindel
i
n
Support Irix
commit
|
commitdiff
|
tree
2006-02-18
Jo
h
annes Sch
i
nde
l
in
O
ptio
n
all
y
support old dif
f
s
commit
|
commitdiff
|
tree
2006-02-18
Johan
n
es Schindelin
Fi
x
cpio cal
l
commit
|
commitdiff
|
tree
2006-02-12
Johannes Schindelin
U
se a hashta
b
l
e
for
obje
c
t
s
in
s
tead of a sorted list
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-01-20
Johannes Schindelin
git-fetch-pack: really
do no
t
ask for
fun
n
y refs
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-01-11
J
o
h
annes Schind
e
lin
glossary: explain "master"
a
n
d
"
origin"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-27
Joh
a
nnes Sc
h
in
d
el
i
n
Han
d
l
e
symlinks
grac
i
ously
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-24
Joh
a
nnes Schind
e
lin
git-init-db: init
i
a
l
i
ze shared
r
epositories with -
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-24
Joha
n
nes Schi
n
delin
Introdu
c
e core
.
shar
e
d
r
e
p
o
sitory
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-23
Joh
a
nnes Schindelin
git-clone: Suppor
t
c
h
angin
g
the origin branch with -o
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-22
J
ohannes Schindelin
sha1_t
o
_hex: properly
term
i
nate
t
he SHA1
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-22
Joh
a
nnes Schi
n
d
e
lin
git
-
format-patch sh
o
ul
d
show the correct version
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-21
Johann
e
s Sch
i
nde
l
i
n
Avoid mis
l
eading suc
c
ess mess
a
ge on error
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-16
Johannes Schindelin
We do not li
k
e "HEAD" as
a
new bra
n
ch name
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-29
Johannes Schinde
l
in
[PATCH] Make gi
t
-mv work in sub
d
ir
e
ctori
e
s, too
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-24
Joh
a
nnes Schin
d
elin
R
e
nam
e
gi
t
-config-set to
g
i
t-repo-config
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-21
Johan
n
es Schind
e
li
n
Allow hierarchical section names
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-21
Johannes S
c
hindelin
g
i
t-conf
i
g-se
t
: Proper
l
y terminate strin
g
s
w
it
h
'\0'
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-20
Jo
h
anne
s
Schindelin
gi
t
-config-
s
et: support sel
e
cting v
a
l
u
es
b
y non-matchi
n
g
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-20
Joha
n
ne
s
S
c
hindelin
git-confi
g
-set: add more
options
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-20
Johannes
Schindelin
Ad
d
t
est case for g
i
t-config-
s
et
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-20
Johannes Schi
n
delin
Add documentation for git-con
f
ig-set
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-20
Joha
n
nes Schindelin
Ad
d
git
-
config-s
e
t, a simple helpe
r
for scripts to
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-20
Joh
a
nnes
Schindelin
Add fu
n
ctio
n
s git_config_set() and git_config_
s
e
t_mu
l
tivar()
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-16
Johan
n
es Schinde
l
in
Give py
t
hon a chance to find "back
p
or
t
ed"
m
odules
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-16
Johannes Schindelin
Fi
x
tests with new git in C
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-15
Johannes Sch
i
ndeli
n
Add
config variable core
.
sy
m
r
efsonly
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-07
Johannes
Sc
h
indelin
Small bu
g
fixes for h
t
tp-push
.
c
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-07
J
ohannes Schindelin
http-fetch: d
o
not use
c
url_message after releasing it
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-07
Johann
e
s Schinde
l
in
Allow GIT_
D
IR
t
o be an
ab
s
olute
p
at
h
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-10-29
Johannes Schindelin
make t5501 less annoying
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-10-29
J
o
hannes Schindelin
fix mul
t
i_ack
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-10-29
Johann
e
s Schindel
i
n
g
it-fetch-pack: Support m
u
l
t
i_a
c
k
extension
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-10-29
Joh
a
nnes Schi
n
delin
git-upload-pack:
S
u
pport the multi_ack protocol
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-10-29
Johannes Sc
h
indel
i
n
Supp
o
rt receivin
g
server ca
p
abilities
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-10-29
Johannes Schind
e
lin
git-
u
pload-pack: More efficient usage of
t
he has_sha1
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-10-29
Joha
n
n
e
s
Schin
d
elin
Implem
e
n
t
a
n
i
n
teroperabili
t
y test fo
r
fetch-p
a
ck/upload
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-10-29
J
o
hannes
S
ch
i
n
d
elin
I
mpleme
n
t a test for
gi
t
-fetch
-
pack/git-
u
pload-
p
ack
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-10-29
Joh
a
nnes Schind
e
lin
Make maximal use of
t
h
e
remote r
e
fs
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-10-29
Johan
n
es Schi
n
delin
Subject: [PATCH]
git-fetch-p
a
ck: Do not use git-rev
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-10-28
Johannes Schindelin
Ad
d
more
generated files
to
.
gitignore
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-10-28
J
o
hannes Schin
d
el
i
n
Li
n
k git-name-
r
ev and git-symbolic-
r
ef from t
h
e mai
n
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-10-26
J
o
hannes Schind
e
lin
Te
s
t in
g
it-init-db
if the fi
l
e
m
ode can be trust
e
d
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-10-26
Joha
n
nes Schi
n
delin
A
d
d
g
it-name
-
rev
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-10-26
Johannes Schindelin
Fix clon
i
ng (memo
r
y
c
o
r
ruption)
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
next