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
M
iklos
Vajna
builtin-merge: al
l
ow
u
sing a custom stra
t
egy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Vajna
builtin-help
:
make some in
t
ernal functions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mi
k
los V
a
jna
t7
6
0
1
: extend t
h
e 'merg
e
picks
u
p the bes
t
r
e
sult
'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-merge: give a proper error mes
s
age for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teac
h
'g
i
t merge' that some
m
e
r
ge strategies
n
o
longe
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
Vajna
Add a new test for git-merge
-
resol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos Vajn
a
t
6
02
1
: add a n
e
w test for git-mer
g
e-
r
esolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajn
a
m
ake remove-das
h
es:
apply t
o
script
s
and programs a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisect: us
e
dash-l
e
ss form on git bisect lo
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vaj
n
a
t
1
0
0
7-ha
s
h-objec
t
.
sh: use quote
s
for the test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
t0001-init
.
s
h: cha
n
ge co
n
fusin
g
directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build in m
e
rge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
Fix t760
1
-merge-p
u
l
l-config
.
sh on
AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-commit-tree: make it usabl
e
from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add n
e
w test
c
ase to
e
nsure
g
it-merge prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajna
hg-to-git:
u
se g
i
t
i
ni
t
instead o
f
git
init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
hg-to-git: rewrite "git-frotz" to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajna
hg-to-git: abo
r
t if the
p
roject
d
irecto
r
y is not
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
h
g-to-git: avoid raising a string excep
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
INS
T
ALL: Updat
e
sec
t
io
n
about git-f
r
otz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Mikl
o
s Vajna
Retire 'stupid' merge st
r
ategy
commit
|
commitdiff
|
tree
2008-07-01
M
ikl
o
s Vajna
Add
new test case
t
o e
n
sure git-merge reduces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new t
e
st to
e
nsu
r
e
g
it-merge
handles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Int
r
o
d
uce get_octopus_me
r
ge_bases() in comm
i
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s
V
ajn
a
g
it-fmt-merg
e
-msg
:
make it usable from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
o
s Va
j
n
a
M
ove
read_cache
_
unmerged() to read-cach
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Add n
e
w test t
o
ensure git-merge hand
l
es pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move par
s
e-o
p
tions's
skip_pref
i
x
() to git-co
m
pat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Mo
v
e
c
omm
i
t
_
list_co
u
nt() to
c
ommit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move split_cmdli
n
e() to ali
a
s
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
i
k
lo
s
Vajna
path-list documentati
o
n: document all functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-comm
a
n
d
documentation: fix "memset()" pa
r
ameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read-tree: d
o
cument -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A simple script to parse the
r
esults
f
rom the testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
git-r
e
base -i:
mention the sho
r
t com
m
and alia
s
es
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remo
v
e
unu
s
ed code in
p
arse_
c
ommit_b
u
ffer(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
M
i
klos Vajn
a
Strbuf docu
m
entation: document most fun
c
t
ions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajn
a
Revision
w
alking documentation:
d
ocu
m
en
t
most
i
mporta
n
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Va
j
na
C
odingGuidelines: A
d
d a note to
avoid assignments i
n
side
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos
V
ajna
git-merge
:
e
xclude unneces
s
ary
o
p
t
ions from OPTIONS_
S
PEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
git-fast-
i
mport: rename cmd_
*
()
f
unct
i
on
s
t
o parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTALL: add a no
t
e about GNU interact
i
ve tools
has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add test
s
for sendemail
.
cc conf
i
guration variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos
V
ajna
git-send-emai
l
: add a
new sendemail
.
cc
c
o
nfiguration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
los Vajna
git-f
o
rmat-patch: add
a new
f
ormat
.
c
c confi
g
uration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Mi
k
l
o
s Va
j
na
git
checko
u
t: add -
t
alias for --track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
M
i
klos Vajn
a
diff opti
o
ns documentation
:
refer
t
o --diff-f
i
lter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
iklos Vajn
a
contrib/hooks:
a
dd an
e
xample pre-aut
o
-gc ho
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
l
os Vajna
Docume
n
tation/hooks
:
add
pre-au
t
o
-
g
c
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
V
ajna
git-gc --auto: a
d
d p
r
e-auto
-
g
c
h
o
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Va
j
na
Do
c
um
e
nta
t
ion/g
i
t-merge: docum
e
nt
subt
r
ee
stra
t
egy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Mikl
o
s
Vajna
git
-
gui
:
Upd
a
ted Hungarian
tra
n
sla
t
ion (e5fba
1
8
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Update Hungarian translation
.
1
0
0% c
o
mple
t
ed
.
commit
|
commitdiff
|
tree
2008-02-29
Mi
k
los Va
j
n
a
Improve
t602
9
to check the real "subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
M
i
k
los Vajna
Documentation/
g
it svn log: ad
d
a note ab
o
u
t
tim
e
zones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Mi
k
los
V
aj
n
a
Do
c
u
mentation
/
git-filter-branch: add
a
ne
w
m
s
g-f
i
lter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
M
iklos
V
a
j
n
a
gi
t
-
c
lean: han
d
le e
r
rors if remo
v
ing file
s
fa
i
ls
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
D
o
cumentatio
n
/git-stash: document
options f
o
r g
i
t stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos
V
ajna
git clo
n
e -s documen
t
ation: force a
new paragrap
h
for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos V
a
jna
builtin-gc
.
c
: guard config parser
from value
=
NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git rev-p
a
rse manpage:
spelling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
git
pull man
p
age: don'
t
in
c
lude
-
n from fetch-options
.
t
xt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos
V
ajna
git-clone -s: documen
t
problems
w
ith git gc --prun
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
I
n
clude rev-list op
t
ions in git-log man
p
age
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
M
ikl
o
s Vajna
l
s
-rem
o
t
e
:
a
dd
-
t and -h
o
ptio
n
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos V
a
jna
Add using
m
erge subtr
e
e How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
M
i
k
l
o
s
Vaj
n
a
t
/
t
7
001: av
o
id unnecessary
E
RE
w
hen using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajn
a
git-sh-setup: document
g
it_e
d
itor() and
g
et
_
a
u
thor_ident_
f
ro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Mi
k
los Vajn
a
everyday: repla
c
e
'
prune' an
d
'rep
a
ck' with 'g
c
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mik
l
os Vajna
Upda
t
e Hungarian tr
a
nslation
.
100
%
co
m
p
le
t
ed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
I
n
clude diff opti
o
ns in
t
he git-log ma
n
page
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
git-
s
end-em
a
il: add a new sendem
a
il
.
t
o configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
M
i
klos Vajna
gi
t
stash: documen
t
ap
p
ly's --index s
w
itch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
g
i
t
-bundle: fix commandline examp
l
es in the manp
a
ge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
User Manu
a
l
:
add a chapter for submodul
e
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hungarian tran
s
lation of g
i
t
-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
M
iklos Vajna
gitwe
b
:
new cgi par
a
meter:
o
pt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos
Vajna
gitw
e
b: prefer git_ge
t
_project_o
w
ner() over ge
t
_file
_
owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos
Vajna
Docu
m
ent
-<n> for git-format-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree