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-merge: give a proper error message for invalid strategies in config
2008-07-22
M
i
klos Vajna
builtin-merge: giv
e
a proper error m
e
ssage fo
r
inval
i
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklo
s
Vajna
Te
a
ch
'
git m
e
rge
'
that some merge strategies no
l
onger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
V
a
jna
Add a new test
f
o
r git-me
r
ge-r
e
solve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vaj
n
a
t6021
:
add a
n
ew test for git-m
e
r
ge-r
e
solve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vajna
mak
e
remove
-
dashe
s
:
apply to scripts and programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klo
s
Vajna
git-bis
e
c
t: use d
a
s
h-les
s
f
o
r
m
on git bise
c
t log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
t1007-hash-obje
c
t
.
sh: use
quotes
for the test descri
p
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
t0001-init
.
sh: chan
g
e confusing
dire
c
tory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build
i
n
merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos Vajna
Fix t7601-m
e
rge-pull-co
n
fig
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klo
s
Vajna
git-co
m
mit-t
r
ee: m
a
k
e
i
t
u
s
able
from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos Vaj
n
a
A
d
d new test
c
ase to ensure git-
m
erge
p
repen
d
s the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
hg-to-git: use git init inste
a
d of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
hg-to-gi
t
: rewrite "
g
it
-
frotz" to "git fro
t
z"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
l
os Vajna
hg-to
-
git: abort if
t
he project directory is no
t
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: av
o
id r
a
ising a string
e
x
cep
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTALL: Update section about g
i
t
-fro
t
z form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retire 's
t
upi
d
' merge strateg
y
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
A
dd new test
c
ase to ensure git-merge reduces oct
o
p
us
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Add new test to ensu
r
e git-m
e
rge handles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vaj
n
a
Int
r
od
u
ce get_oct
o
p
us_merge_bases() i
n
commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-merge-msg: make
it us
a
ble from
o
ther builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
j
n
a
Move
re
a
d_ca
c
he_u
n
merged() t
o
r
e
ad-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Ad
d
new test to ensure g
i
t
-merg
e
handles pull
.
twoh
e
ad
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mo
v
e p
a
rse-options's skip_pr
e
fix() to gi
t
-
c
ompa
t
-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Mov
e
commit_list_count() to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
o
s Vajna
Mov
e
sp
l
it
_
cmdline() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vaj
n
a
p
at
h
-
l
ist
document
a
tion: doc
u
ment all functions a
n
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run
-
command do
c
umen
t
a
t
i
on: fix "m
e
ms
e
t()"
p
arameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-
r
e
ad-t
r
ee: docume
n
t
-
v op
t
i
on
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s
V
a
jna
A simple
script to pa
r
se
t
he results from
t
h
e
testcas
e
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Vajna
git-rebase -i: menti
o
n the short command alias
e
s
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
ajna
Remove unuse
d
code in parse_
c
ommit_buffer
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
M
iklos
V
ajn
a
Strbuf docu
m
enta
t
ion: document most
f
u
n
c
t
ion
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vaj
n
a
Revision walking
d
oc
u
m
entation: documen
t
most important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
M
i
klos Vaj
n
a
Codi
n
gGuidelines
:
Add
a
note to avoi
d
assi
g
nme
n
ts
i
n
s
ide
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Mi
k
l
o
s Va
j
na
git-merge: e
x
clu
d
e unn
e
cessary opti
o
ns from OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklo
s
Vajna
g
it-fas
t
-import: rename cmd_*() functio
n
s to parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Mi
k
los Va
j
na
I
NSTALL
:
ad
d
a note about GNU
i
ntera
c
tive tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
A
d
d tests for se
n
de
m
a
i
l
.
cc
c
onfiguration variab
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Va
j
na
git-se
n
d
-email: add a new sendemail
.
c
c co
n
f
i
gur
a
tion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
gi
t
-format-patch: add a new fo
r
mat
.
c
c confi
g
uration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
gi
t
checkout: add
-
t
a
lias for --track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mi
k
los V
a
jna
d
iff op
t
ion
s
documentation: refe
r
to
-
-
d
iff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mikl
o
s Vajna
contrib/hooks: ad
d
a
n
e
xample pre-auto-g
c
hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
iklos
Vaj
n
a
Documentation/hooks: add
pre-auto-gc h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
g
it-
g
c --auto: add pre
-
au
t
o-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Documenta
t
ion/git-merge: doc
u
ment subtree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Mikl
o
s
Vajna
g
i
t-gui: Updated Hungarian translation (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos V
a
jn
a
Update Hunga
r
ian tr
a
nslation
.
1
0
0% com
p
lete
d
.
commit
|
commitdiff
|
tree
2008-02-29
M
i
klos
V
ajna
I
m
pr
o
ve t602
9
to
check the r
e
al "subtree" cas
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Mikl
o
s Vaj
n
a
Do
c
umentatio
n
/
git svn log
:
add a note about timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
M
iklos
V
a
jna
Documentation/git-filter-branch: add
a
new
msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Va
j
na
git
-
clean: handle e
r
rors if removing files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos
Va
j
na
Docum
e
n
tation/git-stash:
d
o
cument options
for git
s
t
a
sh
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
git
c
lone -s docum
e
ntat
i
on
:
force a new para
g
raph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Mikl
o
s Vajna
bui
l
tin-gc
.
c: guard
c
onfig pars
e
r from value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Mik
l
os Vajna
g
i
t rev-parse manpage: spelling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
M
i
klos Vajna
git
p
u
l
l manpage: don't incl
u
de -n from fetch-options
.
t
x
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-clo
n
e
-s: doc
u
ment proble
m
s with git
gc --prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Mi
k
lo
s
V
a
jna
Include re
v
-list o
p
t
i
on
s
in git-
l
og m
a
n
p
age
.
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
M
i
klos
Vajn
a
Add
using merge
subtree How-T
o
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklo
s
Vajna
t/t7001: avoid unnecessary
ERE when using g
r
ep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
M
i
klo
s
Va
j
na
git-sh-setup: d
o
cument g
i
t_e
d
itor()
and g
e
t_a
u
thor_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Va
j
n
a
e
veryda
y
:
replace 'prune' a
n
d 'repack' with '
g
c'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajn
a
Update Hungarian translati
o
n
.
100% com
p
l
e
ted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklo
s
Vajna
Include
d
i
ff options in th
e
git-
l
og man
p
age
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
g
i
t-send
-
email: add a new sendemail
.
to c
o
nfig
u
rati
o
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
g
i
t
s
tash: d
o
cum
e
nt apply's --in
d
ex switch
commit
|
commitdiff
|
tree
2007-09-29
Mi
k
los Vajna
git-bun
d
le: fix co
m
mandline
e
xamples i
n
the
m
a
npage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
U
ser Manua
l
: add a
c
hapte
r
for
submodule
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Mikl
o
s Vajna
Hungarian t
r
anslat
i
o
n
of g
i
t-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vajna
gitweb: new cgi paramet
e
r:
opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos
V
a
j
na
gitw
e
b: prefer
g
i
t_get
_
project_ow
n
e
r() over get_file_o
w
ner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Mi
k
los
Vajna
Document -<n> for git
-
format-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree