repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin-help: make some internal functions available to other builtins
2008-07-30
Mi
k
los Vajna
builtin-help:
m
ake some internal functions
available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Va
j
na
t7601: exten
d
the 'merge pi
c
ks up the best r
e
sult'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
b
u
iltin-merge: giv
e
a
p
rope
r
error m
e
ssag
e
for invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach 'git merge' that some
m
erge strategie
s
no
longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Ad
d
a
new tes
t
f
or git-m
e
rge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vaj
n
a
t6021: ad
d
a new test for
g
it-merge-re
s
olve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s
Vajn
a
make remove
-
da
s
hes:
a
p
p
ly to scrip
t
s and programs as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
git-bisect: use dash-less form
on git bi
s
ect log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-ha
s
h-object
.
sh: use quotes
for the
t
est descr
i
ptio
n
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t
0
001-in
i
t
.
sh: c
h
ange confusin
g
directory name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos
Vajna
Build
i
n me
r
ge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
V
a
jna
Fix t760
1
-
m
erge-pull-config
.
sh on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los V
a
jna
git-commi
t
-tree:
make it usab
l
e f
r
om othe
r
b
u
iltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add ne
w
test case to e
n
s
u
re gi
t
-m
e
rge prepends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: use g
i
t init instead
of git init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
jna
hg-to-git: rewrite "git-frotz" t
o
"git frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
hg-to-gi
t
: abort if
t
he
p
r
o
ject directory is
n
ot a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajna
h
g-to
-
g
i
t: av
o
id raising a string
exce
p
tion
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
INSTALL: Upd
a
te
section about git-frotz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retir
e
'stupid' merge
s
tr
a
t
e
gy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test case
t
o ensure
g
it-merge reduces
o
ctopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Add n
e
w t
e
s
t to ensur
e
git-merg
e
handles
m
o
r
e than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Va
j
na
Introduce g
e
t_octo
p
u
s_merge_bases()
i
n c
o
mmit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
git-fmt-merge
-
ms
g
: make it usa
b
le from
o
ther builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move read_ca
c
h
e
_
unmerged() to read-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vaj
n
a
Add new te
s
t to ensure git-me
r
g
e handles pull
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Move p
a
rse-options's ski
p
_prefix() to git-compat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Move
c
ommit_lis
t
_count() t
o
commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
ove split_
c
mdline() to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vaj
n
a
path
-
list documentation:
d
ocument all function
s
a
nd
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-comm
a
nd doc
u
menta
t
i
on:
fi
x
"m
e
ms
e
t
(
)" paramete
r
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Mi
k
los V
a
jna
g
it
-
re
a
d
-
tree: document -v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
i
k
l
os Vajn
a
A
s
imple
script
t
o
par
s
e the
r
esu
l
ts from the testcases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Va
j
na
git-re
b
a
s
e -i
:
mention t
h
e short command
aliases in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
os Vajna
Re
m
ove u
n
u
s
ed
c
ode in pars
e
_commit
_
buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vaj
n
a
Strb
u
f document
a
tion: d
o
cum
e
nt most functions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revision walking d
o
c
u
m
entation
:
do
c
um
e
n
t
most important
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Mikl
o
s Vajna
CodingGu
i
d
el
i
nes: Add a not
e
t
o
a
v
oid a
s
signments i
n
sid
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Mi
k
los Vajna
git-merge:
e
x
clud
e
unnecessary
o
ptions from OPTIO
N
S_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
git-fast
-
import
:
rename cmd_*()
f
unc
t
i
ons to parse_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Mi
k
los Vajna
INST
A
L
L
: add a note abo
u
t GNU interactive tools has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
os Vajna
A
dd tests for sendem
a
il
.
c
c configuratio
n
variabl
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Va
j
na
git-send-email: add
a
new s
e
ndem
a
il
.
c
c
c
o
n
f
iguration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Vajna
git-forma
t
-patch: add a ne
w
forma
t
.
cc c
o
nf
i
guration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Mikl
o
s Vajna
g
i
t
checkout: a
d
d -t alia
s
for -
-
trac
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos
V
a
j
na
dif
f
options
d
o
c
umentation: r
e
fer to -
-
d
iff-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
Vajna
con
t
rib/ho
o
k
s: a
d
d a
n
exa
m
ple pre-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Documentati
o
n
/
ho
o
ks: add pr
e
-
a
ut
o
-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
iklos Vajna
git-gc --
a
ut
o
: a
d
d p
r
e-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Mi
k
l
o
s
Va
j
na
Documentation/
g
i
t
-merg
e
: document subt
r
ee strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklo
s
Vajna
gi
t
-g
u
i: Updated Hun
g
arian
t
r
anslation (e5fb
a
18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Mi
k
los
V
ajna
Update Hungarian trans
l
ation
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajn
a
Im
p
rove t602
9
t
o check the r
e
al
"
s
u
b
t
ree"
c
ase
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Va
j
na
Docu
m
entation/git svn log:
a
dd a note about timezon
e
s
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklo
s
V
ajna
Documenta
t
i
o
n/gi
t
-fi
l
ter
-
branch: add a new msg-fi
l
ter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Mik
l
o
s Vajna
git-c
l
ean:
hand
l
e errors if
rem
o
vin
g
f
i
les
f
ails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
M
i
klos
V
ajna
Documentation/git-stash: documen
t
opti
o
ns for git stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
M
i
klos Vajna
git clo
n
e -s documentation: f
o
r
c
e
a new para
g
raph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
bui
l
ti
n
-
g
c
.
c: guard config parser
from
v
alue=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
M
iklos V
a
jna
git rev-parse manp
a
g
e
: s
p
elli
n
g fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
M
i
klos
Vajna
git pull manpage: don't include -n from fet
c
h-options
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajn
a
git-clone -s: d
o
c
ume
n
t p
r
ob
l
ems with
g
it g
c
--prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklos
Vajna
Include rev-list options in gi
t
-log
manpag
e
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
M
iklos
V
aj
n
a
ls-remote: add -t and -h
o
ptions
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Miklos V
a
jna
Add u
s
ing merge sub
t
r
e
e How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Mikl
o
s Vajna
t/t7001: avoid unnecessary ERE when using
grep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Mik
l
o
s Vaj
n
a
git-s
h
-s
e
tup
:
documen
t
g
it_editor() and get_auth
o
r_ident
_
fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
every
d
a
y
: re
p
lace 'prune' and
'
repack'
w
i
th 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
V
a
j
na
Update Hungarian tr
a
n
s
lation
.
100% co
m
p
lete
d
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajn
a
I
n
clude
di
f
f
opti
o
ns
i
n the git-log manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Mi
k
los Vajna
g
i
t-send-email: add
a new s
e
ndemail
.
t
o configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
M
i
klos Vajna
git stas
h
: document appl
y
's --index sw
i
tch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajn
a
git-bund
l
e: fix commandline
e
x
ampl
e
s
in the manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Mikl
o
s Vajna
User Manu
a
l: add
a
chapter fo
r
submod
u
les
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
M
iklo
s
Vajna
H
ungarian
t
ra
n
slation o
f
git-gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Mi
k
los Vajna
gitwe
b
:
n
ew cgi param
e
ter: opt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
M
i
k
l
os
V
a
jna
gitweb: prefer g
i
t_get_project_ow
n
e
r
() over
g
et_fi
l
e
_
owner()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Mik
l
o
s
Vajna
Doc
u
m
e
nt -<n> for git-format-pa
t
c
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree