repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: introduce merge_options
2008-08-31
Miklos Vajna
merge-re
c
ursive: introduce merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
iklos Vaj
n
a
Spli
t
out merge_r
e
cursive() t
o
merge-
r
ecursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
M
i
klos Vajna
Ma
k
efile: enable
SNPRINTF_RETUR
N
S_BOGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
V
ajna
Fi
x
'g
i
t hel
p
help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Mik
l
os Vajna
t9300
:
repl
a
ce '
!
'
with t
e
st_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
M
iklos Vajna
Docu
m
entation:
d
ocum
e
nt the pag
e
r
.
* configuration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos V
a
jna
Builtin git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
M
iklos Vajna
b
u
iltin-hel
p
:
always l
o
ad
_
command_list() in cmd_help
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Vajna
Add
a
s
econd
t
estcase for
h
andling invalid st
r
ategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a new test for using a cu
s
tom merge strateg
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
builtin-merge:
allow u
s
i
n
g
a
custom s
t
rategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los
V
a
jna
bui
l
tin-help
:
make some internal f
u
ncti
o
ns avai
l
able
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mi
k
lo
s
V
ajna
t7601: exten
d
the 'merge picks up the best
r
e
su
l
t
'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
b
u
i
ltin
-
m
e
r
ge: give a proper erro
r
message
f
or inv
a
lid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mikl
o
s
V
ajna
Teach '
g
i
t
merge' that
some mer
g
e str
a
t
e
gies no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add a
n
e
w
te
s
t for g
i
t-mer
g
e-re
s
olve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
ik
l
os Vajna
t6021: add a n
e
w
tes
t
for git-merge-reso
l
ve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklo
s
V
a
jn
a
make remo
v
e-dashes:
app
l
y to scripts and programs
a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
lo
s
Vajna
git
-
bisect: use dash-les
s
form on git bi
s
e
ct log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
o
s
V
ajn
a
t1007-hash-obje
c
t
.
sh
:
us
e
quotes fo
r
the t
e
st
descript
i
on
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klo
s
Vajna
t0001
-
ini
t
.
s
h: c
h
ange confusing di
r
ectory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vaj
n
a
Buil
d
in me
r
ge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
k
l
os
Vaj
n
a
Fix t7601-merge-pull
-
c
onfig
.
s
h
o
n
AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos Vajna
gi
t
-commi
t
-tree: mak
e
it u
s
able f
r
om other bui
l
ti
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
Add new
t
est case
to
e
nsure git-
m
e
rge prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-
t
o-git: use
git init in
s
tead of git
i
nit
-
d
b
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
l
os Vajn
a
h
g-to-
g
it: rewrite "git-
f
rot
z
" to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
a
j
na
hg-
t
o-git: abort if
t
he pr
o
j
e
c
t dir
e
ctory is not
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vaj
n
a
hg-
t
o-git:
avoid raisin
g
a
string exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s V
a
jna
INSTALL
:
U
p
date sec
t
ion about git-f
r
otz for
m
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Mi
k
los Vajna
Retire
'
stupid' merge
s
t
r
a
tegy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
A
dd new
t
est case to ensure git-merge
reduces octop
u
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Add new
t
est
to ensure
gi
t
-mer
g
e
handles more th
a
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
I
n
tr
o
duce get_
o
ctopus_m
e
rge_
b
ases() in com
m
it
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
g
i
t-
f
m
t
-merge
-
msg: mak
e
it usabl
e
from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mov
e
read_c
a
c
he_
u
nmerged() to rea
d
-cach
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Add new
test to ensure git-me
r
ge handles
pull
.
tw
o
h
e
ad
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
M
o
ve pa
r
se-options's skip_prefix() to git-compat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mo
v
e
c
ommit_list_
c
o
u
n
t
() to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mo
v
e split_cmdline() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
p
a
th-list d
o
cumentation:
d
ocume
n
t a
l
l functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vaj
n
a
run-com
m
a
nd documentatio
n
: fix "memset()"
parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
M
iklos Vajna
git
-
read-tree:
documen
t
-v o
p
tion
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los
Vaj
n
a
A
s
i
m
p
le
s
cript t
o
parse t
h
e results from the
t
e
s
t
c
ases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
Va
j
na
git-r
e
b
a
s
e
-i:
m
e
n
tion the short command
aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
k
los Vajna
Remove unused co
d
e in pars
e
_commit_buffer
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
Strbuf
doc
u
menta
t
io
n
: do
c
ument m
o
st
fun
c
tions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Mi
k
los Vajna
Rev
i
sio
n
w
al
k
ing d
o
c
u
mentation: document most im
p
or
t
ant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
M
ik
l
o
s
Vajna
C
o
d
i
n
g
Guidelin
e
s
:
Add a no
t
e to avoid assignm
e
nts inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
g
i
t
-
merge: e
x
clud
e
unne
c
ess
a
ry options from
O
PTIONS_S
P
EC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
git-
f
ast-import: rename
cmd_*() functions to p
a
rse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTALL:
ad
d
a note
abou
t
GNU in
t
eractive too
l
s has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add tests for sendemail
.
cc conf
i
gura
t
ion variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
Vajna
git-
s
end-
e
mail: a
d
d a new s
e
nd
e
mail
.
c
c
configura
t
ion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klos Va
j
n
a
gi
t
-format-patch: ad
d
a ne
w
forma
t
.
cc configura
t
ion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Mi
k
lo
s
Vajna
git
checkout: add -t alias fo
r
--tra
c
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos
V
ajna
dif
f
options do
c
umen
t
ation: refer to --diff-fil
t
er
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
c
on
t
rib/hooks:
add an e
x
amp
l
e p
r
e-auto-gc hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
D
ocumentation/ho
o
ks
:
a
dd pre-auto-
g
c h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
g
it-gc -
-
au
t
o: ad
d
pre-aut
o
-gc
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Mikl
o
s Vajna
Documentat
i
on
/
git-merge: document subtree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
git-gui: Updated Hung
a
ria
n
t
r
anslat
i
on (
e
5fba18
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Mikl
o
s Vajna
Update Hungarian translation
.
100% compl
e
t
e
d
.
commit
|
commitdiff
|
tree
2008-02-29
Mi
k
los Va
j
na
Imp
r
ove t6029 t
o
check the real
"
s
u
btre
e
" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
Documentation
/
git svn log: a
d
d
a
note ab
o
ut time
z
ones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos V
a
jna
Documen
t
ati
o
n
/git-filter-bran
c
h
:
ad
d
a new msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-clean: handle
e
rro
r
s if removing f
i
l
e
s
fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Mi
k
los Vajna
Do
c
u
m
entation/g
i
t-stash: docum
e
nt o
p
tions for
g
it
stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vaj
n
a
g
i
t clo
n
e -s do
c
umentation: f
o
rc
e
a ne
w
paragr
a
ph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
M
iklos
V
ajna
builtin
-
gc
.
c
:
guard config parser from value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos
V
ajna
git rev-par
s
e
m
anpage: sp
e
lling
f
ix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Mik
l
os Vajna
gi
t
pull manp
a
ge: don
'
t in
c
lude -n from fetch-
o
p
tions
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-c
l
on
e
-s: documen
t
p
roble
m
s with git gc --prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos V
a
jna
In
c
lude r
e
v-list opt
i
o
ns in git-log manpa
g
e
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vaj
n
a
ls-remote: a
d
d -t and
-h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
M
iklos Vajna
A
dd u
s
ing mer
g
e sub
t
ree How-
T
o
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos
V
ajna
t
/
t7001: a
v
oi
d
unneces
s
ary
ER
E
when using
grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Mi
k
l
o
s Vajna
gi
t
-
s
h-setup: document
g
i
t_edit
o
r() and g
e
t_author_
i
dent_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
everyd
a
y:
replac
e
'pr
u
ne
'
and 'repack'
w
i
th 'gc
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklo
s
Vajna
Update Hungarian
trans
l
ati
o
n
.
100%
compl
e
ted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Include
diff
o
ptions in the
git-l
o
g manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
M
i
k
los Vajna
git-s
e
nd-email: add a n
e
w sendemail
.
t
o
c
onfiguratio
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos
V
aj
n
a
git sta
s
h: document apply'
s
--index switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos V
a
jna
g
it-bun
d
le: fix command
l
ine
examples
i
n the ma
n
page
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos
V
ajna
U
s
er M
a
n
ual: add a chapter for submodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
M
i
kl
o
s
Vajn
a
Hungarian translation
o
f git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Mik
l
os V
a
jna
gitweb: new cgi paramet
e
r: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
M
i
klos
V
ajna
gi
t
w
eb:
p
ref
e
r
git_get_
p
roject_owner() over ge
t
_
fi
l
e_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vajn
a
Docum
e
nt -<n> for git-
f
ormat-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree