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
Merge branch 'jc/maint-diff-quiet' into maint
2008-09-10
M
i
klos Vajna
t
7
501: always use test_
c
mp instead of d
i
ff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
M
a
ke
f
ile: add merg
e
_recursive
.
h
to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
M
i
k
l
os V
a
jna
Makefile: enable SNP
R
I
N
TF_RETURNS_BOGUS for HP-
U
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Mi
k
los Vajna
F
ix 'git
h
el
p
help
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Mi
k
l
o
s
V
ajna
t9300: replace '!' with te
s
t_mus
t
_
f
ail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos
V
a
jna
Documentat
i
on: do
c
ument
t
he pager
.
* configura
t
i
on setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
M
i
klos
V
a
jna
t7601: extend th
e
'
me
r
ge picks up the best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
iklos Vajna
builtin-merge: give
a
p
r
oper er
r
or message for in
v
alid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vaj
n
a
Teach 'git merge' that s
o
me
m
e
rge strat
e
gi
e
s no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajn
a
Add a new test for git-m
e
r
g
e-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t602
1
: add
a
new test for gi
t
-m
e
rg
e
-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vajna
make remove-dashes:
apply
t
o sc
r
ipts and programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
g
i
t-bise
c
t: use da
s
h
-
le
s
s form on gi
t
bisect
l
og
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajna
t1007-h
a
sh-object
.
sh:
u
se quotes for the
t
es
t
descr
i
ptio
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t
0001-in
i
t
.
sh: change confusing direct
o
ry name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mik
l
os Vajna
Build in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajna
Fix t76
0
1-merge-pull-config
.
sh
o
n AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-
c
ommit-tree: make it usabl
e
from ot
h
er builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
o
s Vajna
Add new test ca
s
e t
o
ensure git
-
m
e
rge p
r
epends
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
aj
n
a
hg-to-git: use git in
i
t inst
e
ad
o
f git init-
d
b
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
hg-to-
g
it: r
e
write
"git-frot
z
" to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos
Vajna
h
g-to-git: ab
o
rt if the
p
r
oject directory is no
t
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-
t
o-git: avoid
r
aising a string exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
INSTALL: Update sectio
n
about git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
M
iklos Vajna
Re
t
i
r
e 'stupid' merge str
a
tegy
commit
|
commitdiff
|
tree
2008-07-01
M
ikl
o
s
Va
j
na
Add new
t
est case t
o
ensure git-merge
reduces
octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Ad
d
new t
e
st to ensure git-merge
h
andles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduce get_octopus
_
merge_bas
e
s(
)
in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vaj
n
a
git-fmt-merge-msg: ma
k
e it usable from
o
ther
builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klo
s
Vajna
Mov
e
r
ead_cache_unmerged() to re
a
d
-
cach
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test to ensure
git-merge h
a
n
d
les pull
.
two
h
ea
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos
Vajna
Move pa
r
se-o
p
ti
o
ns's
s
kip_pref
i
x()
t
o git-comp
a
t-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Move
commit_list_count() to commi
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Move spli
t
_
cmd
l
ine() to a
l
ias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos V
a
jna
path-list documentation: d
o
cume
n
t a
l
l fu
n
ctions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vaj
n
a
run-command docu
m
ent
a
t
i
on: fix "memse
t
(
)" parame
t
e
r
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Mi
k
los
Vaj
n
a
git-read-tree: docu
m
ent -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklo
s
Vajna
A simple script t
o
p
arse the res
u
l
t
s from the testc
a
s
e
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
ajna
git-rebase -i: men
t
ion
the s
h
ort command aliase
s
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
os Vajna
Re
m
ove unused code
i
n parse_commit_bu
f
fe
r
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
M
iklos Vaj
n
a
Strbu
f
documentati
o
n:
d
ocument most
f
u
nctions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revi
s
ion wal
k
ing d
o
cumentation: docu
m
ent
m
ost i
m
portan
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
M
i
klos Vajna
CodingGuidelines: A
d
d a note
to avoid assi
g
nments
inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git
-
merge: exclude unnecessar
y
o
p
ti
o
ns fr
o
m OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Va
j
na
g
i
t-fast-import: rena
m
e cmd_*
(
) functions to parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Mik
l
os Vajna
I
NSTAL
L
: add a note about GNU interactive tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
los V
a
jna
A
dd
tests
for sendemail
.
cc conf
i
g
urat
i
on var
i
able
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-send-email: add a
n
ew sen
d
email
.
cc configuratio
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos V
a
jna
git
-
format-patch
:
a
d
d a n
e
w format
.
cc configurat
i
on
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git checkout: add -t
alias
f
or
-
-tra
c
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
M
i
klos Vajna
diff options documentation
:
ref
e
r to --diff-fil
t
er
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos Vajn
a
contrib/h
o
oks:
a
dd an example pre-a
u
to-gc h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vaj
n
a
D
ocumentation/hooks:
a
dd pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
los
V
aj
n
a
gi
t
-gc -
-
auto
:
add pre-a
u
to-gc h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Documentatio
n
/git-merge:
docu
m
ent sub
t
ree s
t
rate
g
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajn
a
git-gu
i
: Updated Hungarian translation (e5fba18
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajn
a
Update Hungarian
tr
a
ns
l
a
tion
.
100% comp
l
eted
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos V
a
jna
Improve t6029 t
o
check the r
e
al
"
subtre
e
" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Va
j
na
D
o
c
umentation
/
git sv
n
l
og: add a note
a
b
ou
t
timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Documenta
t
i
o
n
/
git-
f
il
t
er-branch:
add
a new msg-fi
l
ter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
M
ikl
o
s Vaj
n
a
git-c
l
e
an: handle errors if rem
o
ving files
f
ails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos
Va
j
n
a
Documenta
t
ion/git-stash:
d
o
cu
m
e
nt
options for git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
M
iklos V
a
jn
a
g
it clone -s documentati
o
n: for
c
e a
new paragr
a
ph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
bui
l
t
in-gc
.
c: gu
a
rd config parser
f
rom value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Mikl
o
s Vajn
a
git rev-
p
arse manpage: spelli
n
g fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
M
iklos Vajna
git pull manpage
:
don
'
t inc
l
ude -n from fetch
-
o
p
ti
o
ns
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Mikl
o
s Vajna
git-clone -s: document p
r
ob
l
ems wi
t
h git gc --pru
n
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Mikl
o
s Vajna
Include re
v
-list
opti
o
n
s
i
n git-log m
a
npag
e
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos V
a
jna
ls-remo
t
e: add -t
and -h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
M
i
k
lo
s
V
aj
n
a
Add usin
g
merge subtree How
-
To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t/t70
0
1
: avoid
u
n
n
ecessa
r
y ERE w
h
en
us
i
n
g grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Mi
k
los Vajna
g
it-sh-s
e
tup: do
c
um
e
n
t
g
i
t_edi
t
or()
a
nd get_author
_
ident_fr
o
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
M
iklo
s
Vajna
e
veryda
y
: repla
c
e
'prune' and '
r
epack' wit
h
'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
i
klos Va
j
na
Update H
u
ngarian translatio
n
.
100
%
complet
e
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mi
k
lo
s
Vajna
I
n
c
l
u
d
e
diff options
i
n the gi
t
-log ma
n
page
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos
V
ajna
git-send-emai
l
:
add a new
s
endema
i
l
.
to
c
o
n
figuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos
V
ajn
a
git stash: docume
n
t apply's -
-
index switch
commit
|
commitdiff
|
tree
2007-09-29
Mik
l
o
s
Va
j
n
a
git
-
bu
n
dle
:
fix
c
o
m
mandline examples
i
n the ma
n
page
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Mikl
o
s
V
a
j
n
a
User Ma
n
ual:
a
dd a
c
h
a
pter for
s
ub
m
odules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos
V
ajna
Hungarian translation of
git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Mik
l
os V
a
jn
a
gitweb: new
c
gi parameter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Mik
l
os Vaj
n
a
g
i
tweb: pre
f
er git_get_projec
t
_owner() over get_file
_
o
w
ner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklo
s
Vajna
Document -<n> for g
i
t-format-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree