repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Use git-merge-file in git-merge-one-file, too
2006-12-22
J
o
hannes Schi
n
d
elin
Use git
-
merge-file in git-merge-on
e
-fil
e
, too
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-19
Johann
e
s S
c
hindelin
Introduce GIT_TEMPLATE_DIR
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-16
Johannes Schindelin
g
i
t
-
branc
h
: rena
m
e
c
on
f
ig var
s
branch
.
<
bran
c
h>
.
*, too
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-16
Johannes Schindelin
add
a function to rename s
e
ctions in t
h
e c
o
nfig
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-16
Johannes Schindelin
Document gi
t
-merge-file
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-14
Jo
h
annes Schind
e
lin
g
it-sh
o
w: grok blobs, tr
e
es and
tags
,
too
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-14
Johannes Schindelin
INS
T
ALL: no need to ha
v
e GNU diff installed
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-13
Johanne
s
Schindel
i
n
m
erge-recursive
:
a
dd/add
r
e
ally is modify/modify with
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-13
Joh
a
n
nes Schindelin
G
et rid of th
e
depende
n
c
y on RCS'
mer
g
e
p
ro
g
ram
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-06
Johan
n
e
s Schind
e
l
in
m
e
rge-file: suppor
t
-p and -q; f
i
x compile warn
i
ng
s
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-06
J
oh
a
nnes Sch
i
ndelin
Add
builtin m
e
rge-fil
e
, a minim
a
l replacement for RCS
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-06
Johan
n
es Schindelin
c
vs-migration d
o
cument: make the need for "push" more
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-05
Johann
e
s Schin
d
el
i
n
xdl_merge(): fix
a
nd sim
p
lify conflict handling
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-05
Johanne
s
Schindel
i
n
diff -b: ignore whitespa
c
e at end of line
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-04
Johannes S
c
h
in
d
elin
git-mv: search mo
r
e
precis
e
ly for sou
r
ce directory
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-03
Johannes Sc
h
indel
i
n
xd
l
_merge(): fix
t
h
inko
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-03
Jo
h
a
nn
e
s Schindelin
xdl_me
r
g
e(): fix an of
f
-by-one bug
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-03
Johannes Schinde
l
in
xdif
f
:
a
dd xdl_merge()
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-28
Joha
n
nes Schindelin
sha1_ob
j
ect_
i
nfo(): be
consistent with
r
ead_sh
a
1_file()
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-28
Johann
e
s Sc
h
in
d
e
l
in
sho
r
tlog
:
use pager
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-21
Johannes Schindelin
sho
r
tlog: fix "-n"
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-20
Johannes Sc
h
indelin
s
hortlog: ha
n
dle email addr
e
sses case
-
insensiti
v
e
l
y
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-20
Johannes Schindel
i
n
shortlog: rea
d
mailmap
f
rom
.
/
.
mailmap again
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-20
J
o
hannes
S
ch
i
ndelin
sho
r
t
l
o
g: do not
crash on parsin
g
"[PATCH"
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-20
Johann
e
s
Schindelin
Build in
s
h
o
rtlog
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-15
Johanne
s
Schind
e
lin
Seek back t
o
c
urre
n
t
filepos when mma
p
(
)ing wit
h
NO
_
MMAP
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-03
Johanne
s
Schindelin
l
ink_temp_to_file: call adjust_shared_perm
(
) on
l
y when
.
.
.
commit
|
commitdiff
|
tree
2006-10-15
Johannes Schindelin
cvsserver
:
f
i
x "cvs diff" i
n
a subdirectory
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-10-15
Johannes
Schindelin
c
v
sser
v
er:
Show
correct l
e
tters for modified, removed
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-10-12
Johann
e
s Schi
n
d
elin
diff: f
i
x 2 white
s
pace is
s
ues
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-10-05
Jo
h
annes Schindelin
Turn on recursive with --summary
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-09-29
Joha
n
nes Schin
d
elin
diff --stat
:
ensure at least
one
'-' for deletions
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-09-28
Johannes Sch
i
ndelin
d
a
emon: def
a
ult to 256
f
or HOST_NAME_MAX if it is not
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-09-28
Johannes
Schind
e
lin
runstatus: do n
o
t recurse in
t
o subdirecto
r
i
e
s
if not
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-09-22
J
ohannes Schin
d
el
i
n
show-branch: m
a
rk ac
t
ive branch with
a
'
*' ag
a
in
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-09-22
Jo
h
annes Schinde
l
in
Fix git-update-ind
e
x
--ag
a
in
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-09-21
Johanne
s
Schi
n
delin
Docume
n
t rec
e
iv
e
.
denyNonFastforwards
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-09-21
Johannes Schind
e
lin
receive-pack: pl
u
g memory leak in fast-forwa
r
d che
c
k
ing
.
.
.
commit
|
commitdiff
|
tree
2006-09-20
Johannes S
c
hind
e
lin
a
dd recei
v
e
.
denyNonFastforward
s
co
n
fig variable
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-09-13
J
ohan
n
es
S
c
h
indel
i
n
Teach
ru
n
status about
--
u
ntracked
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-09-01
Jo
h
annes Schindelin
fmt-
m
erge-msg: f
i
x off-by-on
e
bug
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-29
Johannes Schindelin
Remove unee
d
ed #include
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-29
Johannes Schindelin
Makefile: fix ty
p
o
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-29
J
ohannes
S
chindel
i
n
unpack-o
b
jects: remove unused
variable "eof"
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-21
Joha
n
nes S
c
h
indelin
buil
t
in-
m
v
:
reada
b
ility
patch
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-21
Johannes Schindeli
n
g
i
t-mv: fix off-by-o
n
e error
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-21
Johannes Schindel
i
n
g
it-mv: special case
destinat
i
on "
.
"
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-21
Johannes Schindelin
b
u
iltin-mv:
r
eadabilit
y
patch
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-16
Johannes
S
chi
n
delin
[
PATCH]
git-mv:
a
dd mor
e
path
n
ormali
z
at
i
on
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-16
Johan
n
es Schindel
i
n
git-mv: succ
e
ed even if source i
s
a prefix of destination
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-10
Johann
e
s Sc
h
in
d
elin
Add
t
h
e --color-words o
p
tion t
o
the diff option
s
f
a
m
ily
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-10
Johannes
Schindelin
d
i
scard_cache(): discard
index, even i
f
no file was
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-09
Joha
n
nes
S
ch
i
n
d
elin
merge-r
e
cur
:
d
o
not die unn
e
c
e
ssarily
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-09
Johannes Sch
i
ndelin
mer
g
e-recur: try to merge older me
r
ge
b
ases first
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-09
J
o
han
n
es Schin
d
elin
merge-r
e
cur:
i
f
t
here is no common ancestor, fake empty one
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-09
Johannes S
c
hindelin
merge-recur: do not set
e
nv("G
I
T_INDEX
_
FIL
E
")
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-09
Johannes Schi
n
d
elin
merge-recur: do not call git-write-tree
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-05
Joh
a
nnes Schindel
i
n
http-
p
ush: avoid fork() by calling merge_ba
s
e
s() directly
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-04
Johannes Schindelin
merge
-
re
c
ursive: fix
rename hand
l
i
n
g
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-04
Johannes
S
chindelin
Fix crash when GIT_DIR is
i
nvalid
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-31
Johannes Sch
i
ndelin
merge
-
r
ec
u
r:
virtual commits shall ne
v
e
r be
p
ar
s
ed
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-31
J
o
han
n
e
s
Sc
h
i
n
delin
m
e
r
g
e-re
c
ur: use the unpack_trees
(
) interface i
n
stead
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-31
Johannes Schindelin
read
-
tree: move merge functions
t
o t
h
e library
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-31
J
ohannes Schindelin
read-trees:
refactor the unpack_trees() part
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-31
Joh
a
nnes
S
c
h
i
ndelin
tar-tre
e
: i
l
lustrate an obscure feature be
t
ter
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-30
J
ohannes Sc
h
indelin
merge-recur: fix thinko
i
n
u
n
iqu
e
_pat
h
()
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-29
Jo
h
annes Schindelin
Fix
h
ttp-fetc
h
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-28
J
ohanne
s
Schindelin
Teach git-apply abou
t
'-R'
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-28
Johannes
S
chindelin
M
akef
i
le: ssh-pull
.
o
d
epends on ssh
-
fe
t
ch
.
c
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-28
Jo
h
annes Schindelin
merge
-
recur: Explain why
s
ha_eq(
)
and str
u
ct
s
tage_
d
ata
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-28
Johannes Schindelin
merge-
r
ecur: Cleanup l
a
st mixedCase variables
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-28
J
ohannes Sc
h
indel
i
n
merge-r
e
cur: Fix compiler warning with
-
peda
n
tic
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-28
Joha
n
ne
s
Schin
d
e
lin
mer
g
e-r
e
cur: R
e
m
ove de
a
d co
d
e
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-28
Joh
a
n
n
es Schindelin
merge-recur: G
e
t rid of de
b
ug co
d
e
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-28
Johannes Schindelin
mer
g
e
-
r
e
cu
r
: Conv
e
r
t
variab
l
e
names to lower_case
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-28
J
oh
a
nn
e
s Schindeli
n
Cumulative update
o
f
merge-recu
r
sive in
C
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-26
Johannes Schindelin
cvsse
r
v
e
r: imi
t
ate git-update
-
ref when co
m
mi
t
ting
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-26
Joh
a
nnes
S
chind
e
lin
i
nstaweb: Be
more c
l
e
a
r if ht
t
pd
o
r the browser
fail
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-26
Johannes Schin
d
elin
buil
t
in git-mv: supp
o
rt movin
g
dir
e
ctor
i
es
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-26
Johannes Schindeli
n
Mak
e
git
-
m
v
a built
i
n
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-26
Johannes Schindeli
n
E
x
t
r
a
c
t
helper bits from c-m
e
rge-re
c
ursive work
commit
|
commitdiff
|
tree
2006-07-26
J
o
hannes Schindelin
git-cv
s
s
e
rver: support multiline commit messages
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-26
Johannes S
c
hind
e
l
i
n
t7001: a
d
d test
f
or git-mv dir
1
dir2/
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-26
Johannes Schindel
i
n
gitweb:
fix two warnings
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-26
Johann
e
s Schindelin
git-instaw
e
b
:
respect
b
indir from
Ma
k
efile
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-26
Johanne
s
S
chindelin
git-instaweb: some Apache have mod_cgi builti
n
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-25
Johannes Schindelin
git wra
p
per: add --git-dir=<path> and --bare opti
o
ns
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-25
Joha
n
nes
S
ch
i
ndeli
n
Allow an a
l
i
a
s
t
o start with "-
p
"
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-25
Joha
n
nes Schinde
l
i
n
cvsserver:
a
vo
i
d warning abou
t
active db handles
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-25
Joha
n
ne
s
S
chindelin
cvs
s
erver:
s
uppress
warn
i
ngs
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-24
J
o
h
a
n
nes Schindelin
A
l
ways reset the col
o
r _before_ prin
t
i
n
g
out t
h
e ne
w
l
ine
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-24
Jo
h
ann
e
s
S
chindelin
Fix t4114 on cy
g
w
i
n
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-14
Johannes Sch
i
n
d
e
l
in
S
tatus update o
n
m
e
rge-recursive in C
commit
|
commitdiff
|
tree
2006-07-10
Jo
h
an
n
es S
c
hin
d
elin
Fix linki
n
g for not-so-clever linkers
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-08
Johannes Sc
h
indelin
Clos
e
t
h
e index file between wr
i
ting
and commi
t
ting
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-07
J
o
han
n
es Schind
e
lin
Makef
i
le:
e
x
p
o
r
t
NO_SVN_TES
T
S
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-04
Joha
n
nes Sc
h
indelin
Make g
i
t-
f
mt-merge-msg a builtin
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-03
Johannes
Sc
h
in
d
eli
n
Git
.
xs:
old
e
r
p
e
rl d
o
not know const char *
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-02
Johann
e
s Sc
h
i
ndelin
Makefil
e
: replac
e
ugly and unport
a
b
le sed invocation
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-06-29
J
o
h
anne
s
Schin
d
elin
m
ove get_mer
g
e_bases()
t
o
c
ore
l
ib
.
commit
|
commitdiff
|
tree
next