repo.or.cz
/
git
/
mingw
/
4msysgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin-merge: allow using a custom strategy
2008-07-30
Miklos Vajna
builtin-merge: allow using
a custo
m
strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os Vajn
a
builtin-help: ma
k
e some int
e
r
n
al functions avail
a
ble
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos
V
a
j
na
t
7
601:
extend the 'me
r
ge picks
up
t
he best result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-merge: g
i
ve
a proper
e
rror mes
s
age
f
or i
n
valid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajn
a
Teach 'git merge' that some merge st
r
ategi
e
s no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
V
ajna
A
d
d a new test for git-
m
erge-resolv
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los
V
a
jna
t6021: add a ne
w
te
s
t for
g
it-merge
-
resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
ma
k
e r
e
m
o
ve-dashes: apply to s
c
ripts and
prog
r
ams
as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
V
a
jna
git-bi
s
ec
t
:
use dash
-
less for
m
on git
bisect log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-hash-ob
j
ect
.
sh: use
q
uo
t
es for the
t
est descri
p
tion
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001
-
init
.
s
h: chang
e
co
n
fusing
d
i
rectory
na
m
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
M
iklos Vaj
n
a
Buil
d
i
n merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
F
ix t7601-m
e
rge-pull-config
.
sh on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos V
a
jna
git-
c
om
m
it-tree: make
it
u
sable
f
r
om
other b
u
iltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
ajna
A
d
d
new
test case to ensure
git
-
m
e
rge prepends t
h
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajn
a
hg
-
to-git: use
g
i
t
i
nit instead of git in
i
t
-
db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
l
os Vajna
hg-to-git: re
w
rite "git-frotz" to "git frot
z
"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
kl
o
s Va
j
na
h
g
-to-git: abort
i
f
the
project direc
t
o
ry is
n
ot
a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
h
g
-
to-git
:
avoi
d
r
aisi
n
g a string exception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
I
NSTALL:
Update se
c
tion ab
o
ut git-frotz f
o
rm
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos
V
a
j
na
Ret
i
re 'stupid' m
e
rge s
t
rat
e
gy
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
j
n
a
Add new test
c
ase to ensure gi
t
-merge redu
c
es octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Add new test to en
s
u
r
e git-
m
erge handles more than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Introduce get_oct
o
pus_merge_bases() in commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
gi
t
-fmt-merge-ms
g
: m
a
ke it
u
s
a
ble f
r
om o
t
h
e
r buil
t
ins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move
r
ead
_
c
a
ch
e
_unmerged() t
o
read-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
A
dd new tes
t
to ensu
r
e git-merge h
a
ndles
p
ull
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
M
ov
e
parse
-
options'
s
skip_prefix() to gi
t
-compat-u
t
il
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
a
j
na
Move com
m
it_list_count() to commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Va
j
na
Move
split_cmdl
i
ne() to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
M
i
klos Vajna
path
-
list document
a
tion: docum
e
nt
all funct
i
ons
and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Va
j
na
run-command documentation: fix "memset()" p
a
r
a
meter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read-tre
e
: document -v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A simple scri
p
t
to parse t
h
e res
u
l
t
s
f
r
o
m the test
c
ases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
os
Vajn
a
git-rebase -i: ment
i
on the short c
o
m
m
a
n
d aliases
i
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remove unused
c
ode
in
p
arse_commit_bu
f
f
e
r()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Va
j
na
Strbuf
d
ocumentation: document most
functions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revision
wa
l
kin
g
doc
u
mentation
:
document most i
m
p
ortant
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
C
od
i
ngGuid
e
li
n
es: Add a note
to avoid assignments i
n
side
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
g
i
t-merge:
exclude u
n
n
ece
s
sary op
t
i
o
ns f
r
om OP
T
IONS_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
g
i
t
-fast-i
m
port
:
rename cmd_*(
)
f
u
nctions
to parse
_
*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTALL: add a
n
o
te about GNU interactive tools has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mikl
o
s Vaj
n
a
Add tes
t
s for s
e
n
dema
i
l
.
cc
co
n
figuration
v
a
ri
a
ble
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
lo
s
Vajna
gi
t
-se
n
d-email:
add
a
new sendemail
.
cc configura
t
ion
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
os Va
j
na
git-
f
ormat-patch: ad
d
a new forma
t
.
cc
configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
g
it checkou
t
:
add
-t alias for --track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
M
i
klos Vajna
diff op
t
ions documentation
:
ref
e
r to -
-
diff-filte
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
V
a
j
na
cont
r
ib/hooks: add an example pre
-
a
uto-g
c
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os Vajna
Documentation/hooks
:
add pre-a
u
to-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vaj
n
a
g
i
t-gc --auto: add pr
e
-
a
u
to-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Documentation/git-merge: docum
e
nt sub
t
ree
stra
t
egy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Mikl
o
s Vajn
a
g
i
t-gui:
U
pdat
e
d
Hungar
i
an translati
o
n (e5fb
a
18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
M
i
k
los Vajna
Update Hunga
r
i
a
n
trans
l
ati
o
n
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Mik
l
os Va
j
na
I
m
prove t6029 to chec
k
the real "
s
ubtree"
c
ase
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
M
iklos Vaj
n
a
Documentation/git svn
log: a
d
d
a
n
o
te
about
t
imezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
M
i
klos Vajna
Docum
e
ntation/git-filter
-
b
ra
n
ch:
a
dd a
n
ew msg-f
i
lter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos V
a
jna
git-clean:
ha
n
dle errors
i
f
remov
i
n
g
f
iles fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
Docu
m
entation/git
-
sta
s
h:
doc
u
m
e
nt options fo
r
git stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Mikl
o
s Vajna
git clone -s doc
u
mentation: force a new paragraph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Mik
l
os Vajna
builtin-gc
.
c
:
g
u
ard config parser from v
a
lue=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git
rev-par
s
e manpage: sp
e
l
l
ing
f
ix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
g
it pul
l
m
anpage: don't in
c
lude -n from fetch-opt
i
on
s
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Va
j
na
git-clone -s: document pr
o
blems with git gc --prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Va
j
na
Inc
l
ude rev-list op
t
ion
s
i
n git-log manpage
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls-remote: add -t and -h options
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
Add using merge
s
ubtree How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Miklos
V
ajna
t/t7
0
01
:
avoid unnecessary
ERE when
usi
n
g
g
rep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajn
a
gi
t
-sh-setup: doc
u
me
n
t git_editor
(
)
and get_author_ident_
f
ro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Miklos
V
ajna
ever
y
day: re
p
lace 'prune' an
d
'repa
c
k' with
'
gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos V
a
jna
U
p
date
Hunga
r
ian t
r
ans
l
at
i
on
.
100% com
p
leted
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Include diff op
t
ions
i
n t
h
e git-lo
g
m
a
npage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
M
i
klos Vajn
a
gi
t
-send-email: add a new sendemail
.
to configuratio
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vaj
n
a
g
i
t
stash: d
o
cument apply's --index
s
witc
h
commit
|
commitdiff
|
tree
2007-09-29
Mi
k
los
V
ajna
git-bundle: f
i
x
co
m
m
andline exampl
e
s in the manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
User Manual: add a chapter for submodule
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
H
u
ngarian tran
s
lation
o
f gi
t
-gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
M
i
k
los Vajna
gi
t
web: new cgi pa
r
a
m
eter: op
t
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Mik
l
os Vajna
g
itweb: prefer git_get_
p
ro
j
e
c
t
_
own
e
r() ov
e
r
get_fil
e
_owner
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Mikl
o
s
V
ajna
Document
-<n> for git-format-pa
t
ch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree