repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git merge documentation: -m is optional
2006-07-30
Johannes Schindelin
merge-
r
ecur: fix thinko in
unique_path()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-29
J
ohannes S
c
hindelin
F
ix htt
p
-fetc
h
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-28
Johannes
S
chindel
i
n
T
each git-apply
a
bout '-R'
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-28
J
o
hannes Sc
h
indelin
M
a
kefil
e
: ssh-
p
u
l
l
.
o depends on
ssh-fetch
.
c
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-28
Johanne
s
Schindel
i
n
merge-r
e
c
u
r
: E
x
plain why sha
_
eq(
)
and struct
stage_data
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-28
Joha
n
n
e
s Schindelin
mer
g
e-recur: C
l
eanup
l
ast mixedCase va
r
iables
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-28
Johannes
S
c
hind
e
l
i
n
merge-recur: Fix compiler war
n
ing
w
ith -peda
n
tic
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-28
Johan
n
e
s
Schindelin
merge-recur: Remove dead code
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-28
Johannes Schindeli
n
merge-recur: Get r
i
d of debug code
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-28
Johannes Schindel
i
n
m
erge-re
c
u
r
:
C
o
nvert variable n
a
mes to l
o
wer
_
case
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-28
Johann
e
s Schindel
i
n
Cumul
a
tive update of
m
erge-recursive in C
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-26
Johan
n
es Schindelin
c
v
sse
r
ver: i
m
itate
git
-
update-ref when comm
i
tt
i
ng
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-26
Johannes
Schi
n
d
elin
in
s
taweb: Be
m
ore clear if
ht
t
pd or
t
he browser f
a
il
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-26
Joh
a
nnes Schin
d
elin
bu
i
l
t
in git-mv:
s
upport moving directories
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-26
Joha
n
nes Schinde
l
in
Mak
e
git-mv a builtin
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-26
J
o
hannes Schind
e
li
n
Extract helper bits from c-merge-recursi
v
e work
commit
|
commitdiff
|
tree
2006-07-26
Johan
n
e
s
S
chindelin
git-cvsserver: supp
o
rt multilin
e
com
m
it messages
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-26
Jo
h
annes Schindelin
t7001: add test for git-mv dir1 dir2/
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-26
Johannes Schindelin
gitweb: fix two warnin
g
s
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-26
Johannes
S
ch
i
ndelin
git-instaweb: res
p
e
ct bi
n
dir
from Ma
k
efile
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-26
Johannes Schin
d
elin
g
i
t-i
n
staweb: some A
p
ache ha
v
e m
o
d
_cgi builtin
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-25
Jo
h
a
nnes S
c
hind
e
l
in
g
i
t wr
a
pper: add --git-dir=<pat
h
> and --
b
are options
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-25
Johanne
s
Schindelin
Allow an alias to start with "
-
p
"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-25
Johannes Schindelin
cvs
s
erv
e
r: avoid warning
a
bout
a
ctive db hand
l
es
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-25
Johannes Schindelin
cvsserver: su
p
pr
e
s
s warnings
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-24
Johannes Schindelin
Always reset the
c
o
l
or _
b
efore
_
printing out the newli
n
e
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-24
Johannes S
c
h
i
ndelin
Fix t4114
o
n
cygwin
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-14
Johannes Schinde
l
in
Status
u
p
d
a
te on merg
e
-recursive in C
commit
|
commitdiff
|
tree
2006-07-10
Johan
n
es Schindel
i
n
Fix linking for not-so-clever
linkers
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-08
Johannes Schi
n
delin
C
l
ose
t
h
e index fil
e
b
etween w
r
i
t
i
ng
a
nd com
m
itt
i
ng
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-07
J
o
han
n
es Schindelin
Makefi
l
e: export NO_SVN_
T
ESTS
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-04
Jo
h
annes Schinde
l
in
Make git-fmt-merge-msg a bui
l
t
i
n
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-03
Johannes Sc
h
i
ndelin
G
it
.
xs: older perl
do not
k
n
o
w con
s
t char *
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-02
Joh
a
nnes Schindelin
Makefi
l
e: replac
e
ugl
y
an
d
unportabl
e
sed invocatio
n
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-29
Johannes Schindelin
mo
v
e ge
t
_
merg
e
_bases() to core lib
.
commit
|
commitdiff
|
tree
2006-06-29
Johannes Schindelin
refact
o
r merg
e
_bas
e
s() as preparat
i
o
n to lib
i
fy
merge
.
.
.
commit
|
commitdiff
|
tree
2006-06-28
Jo
h
annes Schindelin
Save errno i
n
ha
n
dle_alias()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-27
Johannes Sch
i
nd
e
lin
format-patch: u
s
e clear_commit_marks
(
) instead of some
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-27
Joha
n
nes
Schinde
l
in
t4014: f
i
x for whitespace
from "wc -l"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-26
Johannes Schindelin
for
m
at-pa
t
ch: introduce "--i
g
n
ore
-
if-
i
n-upstre
a
m
"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-26
Johannes
Sc
h
indelin
add diff_flush_patch_id()
to calculate
t
he patch
i
d
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-25
Johannes Schindeli
n
a
pply:
replac
e
NO_AC
C
U
RATE_DIFF with --
i
naccurate-eof
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-25
Johannes Schind
e
lin
c
v
sim
p
ort
:
al
w
ay
s
s
et $ENV{GIT
_
INDE
X
_FIL
E
} to
$index
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-24
Johan
n
es Schin
d
elin
Tea
c
h diff a
b
out -
b
a
nd -w flags
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-23
Johan
n
es Schindelin
p
atch-
i
d: tak
e
"commit" prefix
a
s well as
"
diff-tree
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
Johannes
Sc
h
indelin
git_confi
g
: access() returns 0 on succ
e
ss, not > 0
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
J
ohannes Schindelin
rep
o
-config:
F
ix late-night b
u
g
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
J
ohannes Schindelin
Read
configura
t
ion also fr
o
m
$
HOME/
.
g
itconfig
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
Johannes Schindelin
Fi
x
s
et
t
i
n
g con
f
ig variabl
e
s with an alternativ
e
GIT_
C
ONFIG
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
J
ohan
n
e
s
Schindel
i
n
Initialize
lock_file
str
u
ct
t
o
all zero
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-18
Johan
n
es Schindel
i
n
diff options:
a
d
d -
-
color
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-06
Johannes S
c
hindelin
If you have a con
f
ig contai
n
in
g
some
t
hing like thi
s
:
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-02
J
o
hannes Schindelin
fo
r
mat-patch: re
s
urr
e
ct extra headers fr
o
m
config
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-31
Johannes Schindelin
send-email:
o
n
l
y
'
req
u
ire' ins
t
ead of 'use' Net::S
M
T
P
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-26
Johanne
s
Schindelin
git-format-patch
--start-number <n>
commit
|
commitdiff
|
tree
2006-05-21
Joha
n
nes Schindelin
fmt
-
patch: Su
p
port --attach
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-21
Johannes Sch
i
ndelin
diff family:
a
d
d --check option
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-07
Johannes Schindelin
Fix
crash when r
e
ading the empty
tree
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-07
Joha
n
n
e
s
S
chindelin
Fix u
s
ers of pre
f
ix_p
a
th(
)
to fr
e
e() only
w
hen necessary
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-07
Joha
n
nes Schi
n
delin
F
ix
users of prefi
x
_
p
at
h
() to f
r
ee() only when nec
e
s
s
ary
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-06
Johannes
S
c
hindelin
fmt
-
p
a
t
c
h: understa
n
d old <his> notatio
n
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Joh
a
nnes Schindelin
repo-config
:
trim white-space before com
m
e
n
t
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Johann
e
s Schi
n
del
i
n
Te
a
ch fmt-patch abo
u
t --keep-subject
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Johann
e
s
S
ch
i
n
d
e
lin
Teach
f
mt-patch abou
t
-
-nu
m
bered
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Johanne
s
S
chindelin
fmt-patc
h
:
imple
m
ent -o <di
r
>
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Johannes
S
chind
e
li
n
fmt-pat
c
h: output file names
t
o
stdout
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
J
oh
a
nnes Schindelin
Teach fmt-patch to
write individual
file
s
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Joh
a
nnes
S
chindelin
builtin-push: --all and --tags _are
_
explicit refspecs
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-04
Johann
e
s Sch
i
ndel
i
n
Ad
d
a
con
v
ers
i
on
t
ool to migrate remote inform
a
tion
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-04
Johannes Schin
d
elin
fetch
,
pull
:
ask
con
f
ig fo
r
remote
i
nformation
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-03
Johannes
Sc
h
indelin
repo
-
con
f
ig: de
c
o
n
volute
l
o
gi
c
s
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-03
Johannes Schindelin
r
epo-c
o
nfig:
s
upp
o
r
t
--get-r
e
gexp
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
Johannes Schindelin
repo-config: trim
w
hite-space
b
e
f
ore
c
omment
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
J
o
hannes
Sc
h
ind
e
lin
re
p
o-config: fix segfault with no argument
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
Johanne
s
Sch
i
ndelin
fet
c
h, pul
l
: a
s
k
c
onfig for rem
o
te
information
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
Joh
a
nnes S
c
hinde
l
in
builtin-push: also ask config
for
r
emote info
r
mation
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
Johann
e
s
Sch
i
ndelin
cache-tr
e
e: replace a
sscanf()
by two
s
t
r
tol() calls
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-30
Johanne
s
S
c
hindelin
bui
l
t
i
n
-
push: resurrect parsi
n
g of Push: lines
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-16
Johannes Schindel
i
n
pager: do
not for
k
a
p
a
g
er if
PAG
E
R is set to empty
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-16
Johan
n
es Sc
h
i
ndelin
diff-op
t
ions: add --patch-with-st
a
t
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-13
J
o
hannes Schinde
l
in
diff-optio
n
s: add --stat (tak
e
2)
commit
|
commitdiff
|
tree
2006-04-13
Johann
e
s Sc
h
indelin
dif
f
-
options: add
-
-stat (take 2)
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-05
J
oha
n
nes S
c
hindelin
Fix compile w
i
th
e
xpa
t
, but an o
l
d curl v
e
rsion
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-05
Johannes Schindelin
O
n s
o
me
p
lat
f
orms, certain hea
d
er
s
need to
b
e include
d
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-05
Johannes Sc
h
in
d
e
l
in
cvs
i
mport: use git-update-ref when updat
i
ng
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-03-27
Johanne
s
Schindelin
Remove dep
e
ndency on
a
file named "-l
z
"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-03-12
Joh
a
nnes
S
chindelin
imap-se
n
d: A
d
d missin
g
#include f
o
r ma
c
osx
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-03-03
J
o
hannes Sc
h
indelin
Fix t
e
st c
a
se fo
r
s
ome sed
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-03-01
Johannes Schindelin
Warn about i
n
v
al
i
d refs
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-02-22
Johannes Schindelin
Use
Ryan's git-annotate instead
o
f jsannota
t
e
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-02-22
Johannes S
c
h
i
ndelin
Fi
x
"gmake
-
j"
commit
|
commitdiff
|
tree
2006-02-20
Johannes Schindelin
Really ho
n
our NO_PY
T
HON
commit
|
commitdiff
|
tree
2006-02-20
Johannes
S
chinde
l
in
avoid
m
akefile over
r
ide warning
commit
|
commitdiff
|
tree
2006-02-19
Jo
h
annes Schi
n
de
l
in
Fi
x
es for
ancient versi
o
ns of GNU make
commit
|
commitdiff
|
tree
2006-02-19
J
o
h
a
nnes Schi
n
de
l
in
Opt
i
onall
y
work witho
u
t python
commit
|
commitdiff
|
tree
2006-02-18
Johannes Schindelin
Support Irix
commit
|
commitdiff
|
tree
2006-02-18
Johan
n
e
s Sch
i
ndelin
Optionall
y
support old dif
f
s
commit
|
commitdiff
|
tree
2006-02-18
Johannes Sc
h
inde
l
in
Fix cpio cal
l
commit
|
commitdiff
|
tree
2006-02-12
J
ohanne
s
Schindel
i
n
Use
a
hasht
a
ble for
obj
e
c
t
s
instead of a s
o
rted
list
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-01-20
J
o
hannes
S
chinde
l
i
n
git
-
fetch-pack: really
d
o not ask for funny refs
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
next