repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Teach fsck and prune about the new location of temporary objects
2008-07-23
Miklos Vajna
t760
1
: exten
d
the 'merge pi
c
ks up the best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
built
i
n-m
e
rge
:
give
a
prop
e
r error
m
e
ssage for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mikl
o
s Vajna
T
e
a
ch 'git merge' that som
e
mer
g
e
s
tr
a
tegies no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
os
V
a
jna
Add a new
t
est f
o
r git-merge-resolv
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
Vajna
t6021: add a new
test for
g
it-merge-re
s
olve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
n
a
make rem
o
ve-dashes
:
a
pp
l
y to scrip
t
s
and programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vaj
n
a
git-bisec
t
: us
e
dash-less form
o
n
git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
t1007-hash-
o
bject
.
sh: use
q
uo
t
e
s for the test des
c
ription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-init
.
s
h
:
c
hange confusing directory
n
a
m
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
i
klos Vajna
Build i
n
merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klo
s
Vajna
F
i
x t7601-merge-pul
l
-
co
n
fig
.
sh on A
I
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajna
git-commit-tree:
m
ake it usable from
o
ther bui
l
tins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Vajna
Add
new t
e
st
c
ase to ensure git-merge
prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos V
a
jna
h
g
-
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
Mikl
o
s Vajna
hg-
t
o-git: rewrite "git-fro
t
z
" t
o
"git f
r
o
tz
"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
hg-to-git: abort if the project dir
e
c
t
o
r
y is
not
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
hg-to-git: avoid r
a
ising a string
e
xceptio
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos V
a
jna
INSTA
L
L:
U
p
d
ate sect
i
on about git-f
r
otz f
o
rm
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Mi
k
los Vajna
Retire
'
stupid' merge
st
r
ategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Add new test cas
e
t
o
ensure git-merge
reduces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
A
dd new tes
t
to ensure git-merge
handles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduce
get_octopus_m
e
rge_ba
s
es()
i
n commi
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
l
os Vajna
gi
t
-fmt-merge-
m
sg:
make it us
a
ble from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Mo
v
e read_cache_unmerg
e
d
() to rea
d
-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Add new
t
est t
o
ensu
r
e git-
m
erge handles pul
l
.
tw
o
h
ea
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vaj
n
a
Move parse-option
s
's skip_pr
e
fix() to g
i
t-compat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
o
ve
c
o
m
mit_
l
ist_count() to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
los V
a
jna
Mo
v
e
s
p
lit
_
cmd
l
in
e
() to a
l
ia
s
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
Vajna
p
ath-list doc
u
mentation: document all function
s
and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
r
un-command
d
ocumentation: fix "me
m
set()" parame
t
er
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
M
i
klos Vajna
g
i
t
-read-
t
ree: docum
e
nt -v op
t
ion
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los
Vajna
A
si
m
p
l
e script to parse the
r
esul
t
s
f
rom the
t
estcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
Vajna
git-r
e
base -i: mention the short com
m
and
a
lias
e
s i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos Vajn
a
Remove unused cod
e
in p
a
rse_commit_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
M
i
klos Vajna
Strb
u
f docume
n
tation: do
c
ument m
o
st functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
i
k
l
os Vajna
Revision wal
k
i
n
g
doc
u
me
n
tati
o
n
:
docu
m
ent mo
s
t
i
mport
a
n
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
M
iklos
V
ajna
CodingGuid
e
l
i
n
e
s: Add a note to avoid assignm
e
nts inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Mi
k
los
V
a
j
na
git
-
me
r
ge: exclude un
n
ecessary opti
o
n
s
from OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
M
ik
l
os
Vajna
git-fast-import: rename cmd_*(
)
f
unction
s
to
parse
_
*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Mikl
o
s
V
ajna
INSTALL: add a note
about GNU in
t
eractive tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos V
a
jna
Add tests for se
n
d
emai
l
.
cc
c
o
n
f
i
g
u
ration variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos Va
j
na
g
i
t-send-email
:
ad
d
a new sendem
a
il
.
cc configura
t
ion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-format-patch:
add a
new format
.
cc configurat
i
o
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos
V
ajn
a
g
i
t
c
heckout: add -t alia
s
for --trac
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
M
iklos Vajna
d
i
ff options documentat
i
on:
r
efer to --diff-
f
ilter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
contrib/hooks:
add an example
p
r
e-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os
V
ajna
Docum
e
nta
t
ion
/
ho
o
ks: add pre-auto-gc
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
V
ajna
git-g
c
--
a
uto: a
d
d
pre
-
auto
-
gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Mikl
o
s Vajna
Docume
n
tation/git-merge
:
document subtree
s
trategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
git-gui:
Updated Hungarian translation (e
5
fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Va
j
na
Update H
u
ngarian tr
a
nslati
o
n
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Mik
l
os Vajna
I
m
pro
v
e t6029 to check t
h
e real "subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
M
i
k
l
os Vajna
D
o
cumentation/git
s
vn log: add
a
note about timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Document
a
tion/git-
f
ilter-bran
c
h
:
add a n
e
w msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-clean: ha
n
dle e
r
rors if remov
i
ng files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
Doc
u
mentation/g
i
t-stash: document
o
p
tio
n
s for git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos
V
aj
n
a
git clone
-
s
documentation: force a new paragraph f
o
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklo
s
Vajna
builtin-gc
.
c: guard config par
s
er fro
m
v
al
u
e=NU
L
L
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
M
iklos V
a
jna
git rev-parse manpage: spelling
fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos
Va
j
na
git
pull ma
n
page:
don't include -n
fro
m
fetc
h
-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vaj
n
a
g
it
-
clone -s: doc
u
ment
problems wi
t
h
git gc --prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Mikl
o
s Vajna
Include rev
-
l
ist options in git-log
manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
M
iklos Vajna
ls-re
m
ote: add -t
and
-h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
M
iklos
Vajna
Add usin
g
merge subtree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t
/
t7001
:
avo
i
d
unne
c
essary ERE w
h
en using gr
e
p
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajn
a
git-sh-setup
:
documen
t
git_editor() a
n
d get_author
_
ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos V
a
jna
e
veryday
:
replace 'prune' and
'
r
epack' with 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update Hun
g
arian
translati
o
n
.
100%
c
om
p
leted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Include diff options
i
n the git-log manpa
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
git-sen
d
-
e
mail: add a
new sendemail
.
to configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git sta
s
h: document apply
'
s
-
-index
switch
commit
|
commitdiff
|
tree
2007-09-29
Mi
k
los Vajna
gi
t
-bundle: f
i
x commandl
i
n
e examples in the
manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
U
ser Manual: add a chapter for su
b
modules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos
Vajna
Hungaria
n
tr
a
n
s
lation of git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklo
s
Vajna
gitweb: new cgi parameter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
gitweb:
prefer git_get_projec
t
_
o
wner() o
v
e
r
get_f
i
l
e_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vajna
D
ocu
m
ent -<n> for git
-
for
m
at-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree