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-recur: Get rid of debug code
2006-07-28
Johannes Schindelin
merge
-
rec
u
r
: Get rid o
f
debug code
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-28
Johann
e
s Schinde
l
in
merge-recur: Convert
variable names to lower_case
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-28
Joha
n
n
es S
c
hindelin
Cumulative update
of merg
e
-rec
u
rs
i
v
e in C
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-14
Jo
h
annes Sc
h
indel
i
n
Stat
u
s update on
merge
-
rec
u
r
sive
in C
commit
|
commitdiff
|
tree
2006-07-10
Johannes Schindel
i
n
F
i
x linking
f
or
n
ot-
s
o-c
l
ever
l
inker
s
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-08
Joh
a
n
nes Sch
i
n
delin
Close
t
he index file between writin
g
a
n
d co
m
mitting
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-07
Johannes S
c
h
i
ndelin
Makefile: e
x
port NO_SVN_TES
T
S
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-04
Johanne
s
S
chi
n
deli
n
Make git
-
fmt-merge-ms
g
a bui
l
tin
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-02
Johannes
Schindelin
Makefile: re
p
la
c
e ugly and unportable sed
invocation
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-29
J
o
hannes Sc
h
indelin
m
o
ve get_merge_bases() to
c
o
r
e l
i
b
.
commit
|
commitdiff
|
tree
2006-06-29
Johann
e
s Schin
d
e
lin
r
efactor
merge_bases() as
p
reparat
i
o
n
to libify merge
.
.
.
commit
|
commitdiff
|
tree
2006-06-28
J
o
han
n
es Schindelin
Save errno in h
a
ndl
e
_alias()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-27
J
ohannes Schind
e
lin
f
o
rmat-pa
t
ch: us
e
clea
r
_
c
o
mmit_m
a
r
ks()
instead of some
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-27
J
o
hannes Schindelin
t4014: fix for
whit
e
spac
e
f
rom "w
c
-l"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-26
Joha
n
nes S
c
hind
e
lin
format-pat
c
h
: introd
u
c
e
"--ignore-if-in-upstream"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-26
Johannes Sc
h
ind
e
lin
a
d
d di
f
f
_fl
u
s
h
_patch_id() t
o
ca
l
culate t
h
e
patch i
d
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-25
Johannes Schindelin
apply: replace NO_AC
C
URA
T
E_DI
F
F with --inac
c
urat
e
-
e
of
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-25
Johanne
s
Schi
n
delin
cvsimport:
alw
a
ys set $ENV{GIT_IN
D
EX_FILE} to $index
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-24
Joha
n
nes Schindelin
T
e
ach diff ab
o
ut -b
a
n
d -w
f
lags
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-23
Johannes Schindelin
patch
-
id: take "commit" prefix as
well as "
d
iff-tree
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
Johannes Sch
i
ndelin
g
i
t
_c
o
n
fi
g
: acces
s
() ret
u
rns 0 on su
c
cess, not > 0
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
Johannes Schindelin
repo-c
o
nfig: Fix
lat
e
-
ni
g
ht
bug
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
Jo
h
a
nnes Schindelin
Read
c
onfigur
a
tion
a
l
so from
$
HOME/
.
gitconfig
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
Johannes Schind
e
li
n
F
ix setting
c
on
f
ig variable
s
with an alternative GIT_CON
F
IG
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
Johanne
s
Schindelin
I
nitiali
z
e lock_file struct to all
z
e
r
o
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-18
Johann
e
s Schindelin
d
i
ff opt
i
on
s
: ad
d
-
-
c
olor
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-06
Joha
n
nes Schindelin
If you have a conf
i
g conta
i
ning som
e
th
i
ng like this:
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-02
Joha
n
nes Schindelin
format-patch
:
re
s
urrect
e
xtra headers from config
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-31
Johannes Schindelin
send-email:
o
nly 'require' instead of
'use
'
N
e
t::SMTP
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-26
Johannes
Schindelin
g
it-format-pat
c
h --star
t
-number <n>
commit
|
commitdiff
|
tree
2006-05-21
Johannes Schindeli
n
fm
t
-patch: Support --at
t
ac
h
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-21
Johannes Sch
i
ndelin
diff f
a
mily: a
d
d --check
o
ption
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-07
Johannes Sc
h
indeli
n
Fix crash when read
i
ng
t
he emp
t
y tree
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-07
Johann
e
s Schindelin
Fix use
r
s of pr
e
f
i
x_path
(
) to
f
ree() only
w
hen necessary
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-07
Johanne
s
Schindelin
Fix users of prefix_path(
)
to free() on
l
y when necessary
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-06
Johanne
s
Schind
e
lin
fmt-
p
atch: unders
t
and
old <his> notatio
n
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Johannes
S
chi
n
d
e
lin
repo-config: t
r
im whi
t
e
-spac
e
before
c
o
mment
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Joh
a
n
n
e
s Schind
e
lin
T
each f
m
t-pa
t
ch abou
t
--keep-subjec
t
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Johan
n
e
s
Schin
d
elin
T
e
ach fmt-p
a
tch abo
u
t --numbered
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
J
o
h
a
nnes Schindel
i
n
fmt-p
a
tch: implemen
t
-o <dir>
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Johanne
s
Schinde
l
in
fmt-pat
c
h
:
outpu
t
fi
l
e names to stdout
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
J
o
han
n
e
s
Sch
i
ndel
i
n
T
e
a
ch fmt-patch to
write individual fil
e
s
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Johann
e
s Schindelin
builtin-push:
--all and --tags
_are_ explicit refspecs
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-04
Jo
h
annes Sch
i
n
d
elin
Add a conversion too
l
to m
i
g
r
ate remo
t
e info
r
mation
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-04
J
o
han
n
es Schindelin
fetc
h
,
pull
:
a
s
k
co
n
fig
f
or remote i
n
fo
r
mation
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-03
Johannes S
c
hindel
i
n
repo-
c
o
n
fig: d
e
c
onv
o
l
u
t
e
l
ogics
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-03
Johannes Sc
h
indelin
r
e
po-confi
g
: suppor
t
--
g
e
t-regexp
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
Johann
e
s
S
chindel
i
n
repo-config: trim white-space before commen
t
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
Johannes Schindelin
repo-confi
g
: fix segfault
w
i
th no ar
g
umen
t
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
Johann
e
s Sch
i
ndelin
f
e
tch
,
p
u
l
l: ask config f
o
r
r
e
mote informa
t
ion
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
Joh
a
nnes Sch
i
ndelin
builtin-push:
also
a
sk
config for r
e
mot
e
i
n
for
m
a
tion
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
Johannes Sc
h
in
d
elin
cache-tree: replace
a
s
s
can
f
() by two
st
r
tol() calls
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-30
Johannes Schinde
l
in
builtin-push:
resurrect p
a
rsing of
P
ush: lines
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-16
Johanne
s
Schin
d
elin
pager: do
n
ot fork a pag
e
r if P
A
GER is set to empty
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-16
Johannes Sch
i
n
d
e
l
in
dif
f
-
opti
o
ns: a
d
d -
-
p
atch-
w
ith-stat
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-13
J
o
hannes Schindelin
diff-
o
ptions
:
a
dd --st
a
t (take 2)
commit
|
commitdiff
|
tree
2006-04-13
Johannes
Schindelin
di
f
f-o
p
tions: ad
d
-
-stat (take 2)
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-05
Johannes Schindelin
Fix comp
i
le with expat, but an
o
l
d
c
url version
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-05
Johannes Sc
h
indelin
On
some platforms, certain heade
r
s need to be incl
u
ded
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-05
Johann
e
s Schinde
l
in
c
vsi
m
por
t
: use git-update-r
e
f when
updating
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-03-27
Johannes Schindelin
Remove dependenc
y
on a file named
"-lz
"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-03-12
Jo
h
a
n
nes Schinde
l
in
imap
-
se
n
d: A
d
d missing #include for mac
o
sx
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-03-03
Johan
n
es Schin
d
e
li
n
Fi
x
t
est case
for s
o
me sed
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-03-01
Johannes
S
chi
n
delin
Warn about i
n
valid r
e
fs
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-02-22
Johanne
s
S
c
hindelin
Use
R
y
an'
s
g
i
t
-annotate instead
of
jsannotate
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-02-22
Johannes
S
chindelin
Fix "gmake
-
j
"
commit
|
commitdiff
|
tree
2006-02-20
Jo
h
ann
e
s Schindelin
R
eally honou
r
NO_PYT
H
ON
commit
|
commitdiff
|
tree
2006-02-20
J
o
h
ann
e
s Schindelin
avoid makef
i
le override warning
commit
|
commitdiff
|
tree
2006-02-19
Johannes S
c
hinde
l
in
Fixes
for
a
ncien
t
versi
o
ns
of GNU make
commit
|
commitdiff
|
tree
2006-02-19
Joh
a
nnes Schindelin
O
ptionally work without python
commit
|
commitdiff
|
tree
2006-02-18
Johannes Schin
d
el
i
n
Support Irix
commit
|
commitdiff
|
tree
2006-02-18
Jo
h
annes Schind
e
lin
Optionally supp
o
r
t
old di
f
fs
commit
|
commitdiff
|
tree
2006-02-18
Jo
h
anne
s
Sch
i
ndel
i
n
Fix cpio ca
l
l
commit
|
commitdiff
|
tree
2006-02-12
Johannes Schin
d
e
l
in
Us
e
a hashtable for objects
i
nstead
o
f
a sort
e
d lis
t
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-01-20
J
ohanne
s
S
chindelin
git-f
e
tch-pack: re
a
lly do
n
o
t a
s
k for funny refs
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-01-11
Johannes Schinde
l
in
glossary: e
x
plain "
m
a
ster" a
n
d "origin"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-27
J
o
h
annes Schindelin
H
andle symlinks gr
a
c
io
u
s
ly
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-24
Johannes Sch
i
nd
e
lin
git
-
in
i
t-db
:
initialize sh
a
red repositories
w
ith -
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-24
Jo
h
annes Schin
d
elin
I
ntro
d
uce cor
e
.
sharedrepos
i
tory
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-23
Johannes Schindelin
git-clone: Support
changing the o
r
igin
b
ran
c
h with -
o
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-22
Joha
n
nes Schindelin
sha1_t
o
_hex: prope
r
l
y ter
m
inate the
S
HA1
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-22
Joh
a
nnes Schindelin
git-format-
p
atch shou
l
d sho
w
t
he correct version
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-21
Johannes Schin
d
elin
Avo
i
d misleadin
g
success
mess
a
ge on error
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-16
Jo
h
annes Schin
d
eli
n
We do not like "HEAD" as
a new branch name
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-29
Johanne
s
Schin
d
eli
n
[PATCH] Make git-m
v
work in subdire
c
tories,
t
oo
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-24
Johan
n
e
s
S
c
hindelin
Rename g
i
t-config-set to git-rep
o
-config
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-21
Johan
n
es
S
chindel
i
n
Allow hierarch
i
cal section na
m
es
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-21
Johannes Schindelin
git-con
f
ig
-
set: Properly te
r
minate strings wi
t
h '\0'
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-20
J
oha
n
ne
s
S
c
h
in
d
elin
git-c
o
n
fig-set:
support selecting
v
a
lues by non-matchi
n
g
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-20
Jo
h
a
n
nes Schindelin
git-config-set: add more options
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-20
Johannes Schindelin
Add te
s
t case
for git-
c
onfig-
s
et
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-20
J
o
ha
n
nes Schindelin
Add documentation for git-co
n
fig-set
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-20
J
oh
a
nnes Schinde
l
in
Add git-config-
s
et, a simp
l
e helper for scripts
t
o
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-20
J
o
hann
e
s Schindel
i
n
Add f
u
nctio
n
s
git_
c
on
f
i
g_set()
and git_config_set_multivar()
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-16
Johannes Schindelin
Give
p
ytho
n
a chance to
find "b
a
c
k
ported" modules
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-16
J
o
hannes Schindelin
Fix tes
t
s with new git in C
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-15
Johan
n
es Schindelin
Add config v
a
r
ia
b
le core
.
sy
m
refs
o
nly
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-07
J
o
h
annes
S
c
hi
n
d
e
lin
S
m
a
l
l bugf
i
xes f
o
r http-push
.
c
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-07
Joh
a
nnes Schinde
l
in
http-fetch: do
n
o
t use curl_message aft
e
r
r
eleasing it
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-07
Johannes Schin
d
elin
A
llow GIT_DI
R
to be an absol
u
te path
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
next