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
Merge branch 'jk/maint-ls-files-other' into maint
2008-10-14
M
iklo
s
Va
j
n
a
Add te
s
tcase
t
o ensure
m
er
g
ing an early part
of
a br
a
n
ch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklo
s
V
a
jna
tes
t
-li
b
: fix
color
r
e
s
et in say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7
5
01: always use test
_
cm
p
in
s
t
ead o
f
dif
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajn
a
M
akefile: ad
d
merge_recursive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Mikl
o
s
V
ajna
Makefile: e
n
able S
N
PRINTF
_
RETURNS_BOGUS
for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix
'git help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklo
s
V
aj
n
a
t930
0
: replace '!
'
w
i
th
test_must_f
a
i
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Docum
e
ntatio
n
:
d
ocum
e
n
t the pag
e
r
.
* c
o
nfigur
a
t
i
o
n se
t
ting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos
V
ajna
t7601: extend t
h
e
'me
r
ge picks up the best r
e
sult'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-mer
g
e: give a proper
e
rror mess
a
ge
f
or inv
a
l
i
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
los Vajna
Teach 'g
i
t merge' that some m
e
rge strate
g
ies
no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add
a
ne
w
test
f
or git-mer
g
e-resol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vaj
n
a
t6021: add a new t
e
s
t
f
or
git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
m
a
ke
remove-d
a
shes: apply to s
c
r
i
pts and programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos
V
aj
n
a
git-bisect: use dash-less
form on git bi
s
ect lo
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
k
los V
a
jna
t1007
-
hash
-
obje
c
t
.
s
h: use quotes for
t
h
e test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vajn
a
t0001-init
.
sh: change confusing directory n
a
me
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mi
k
l
os
V
ajna
Build in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
k
l
os Vajna
Fix t7601-merge
-
pull-config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
iklo
s
Vajna
git
-
commit-tree: ma
k
e it usable f
r
o
m
other buil
t
ins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new tes
t
case
t
o en
s
ur
e
git-merge p
r
epend
s
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
hg-to-git
:
use git init instead of git
i
n
it-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: rewrite "g
i
t-frotz
"
to
"
g
it frotz
"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
o
s
Vajna
hg-to-
g
i
t
:
abort if th
e
project director
y
is
not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
V
a
jn
a
hg-
t
o-git
:
avo
i
d raising a string exc
e
p
tion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajna
I
N
STALL: Update sect
i
on ab
o
u
t
git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retire 'stupid' merg
e
strategy
commit
|
commitdiff
|
tree
2008-07-01
M
iklos V
a
jna
Add new test c
a
se to ens
u
re
g
it-
m
erge reduces octop
u
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
los Vajna
Add new
t
e
st
to e
n
sure g
i
t-merge
h
and
l
es more t
h
an
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Va
j
na
Intr
o
duce get_octopus_merg
e
_bas
e
s() in com
m
i
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
git-fmt-
m
erge-ms
g
: mak
e
it usa
b
le from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Move read_c
a
c
h
e_
u
nmerged()
t
o
r
ead-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
A
dd new tes
t
to ensure git-mer
g
e handles
pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move
par
s
e-opt
i
ons's skip_pre
f
ix() to git-com
p
at-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
n
a
Move commit
_
list_
c
ount() to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
V
ajna
Move
s
plit_c
m
dline() to a
l
i
a
s
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mi
k
los
V
a
j
na
path-list documentat
i
on: document a
l
l funct
i
ons and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
iklos Vajna
run-c
o
m
mand do
c
umentation: fix "mems
e
t()" par
a
me
t
er
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git
-
r
e
a
d-tree: d
o
cum
e
nt -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A
s
imple script to parse the result
s
from the
testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
git-rebase -i:
mention the short comm
a
nd
alia
s
es in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajn
a
R
e
m
ov
e
unused code in parse
_
co
m
mit
_
buffer(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
M
ik
l
os Vajna
Strbuf do
c
umentatio
n
:
d
ocument
m
ost fu
n
ctions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
iklos Vajna
Revision walking document
a
tion: docume
n
t most important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Va
j
na
CodingGuidel
i
nes:
A
dd a note to
avo
i
d assignments ins
i
de
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Mikl
o
s Vajna
git-mer
g
e: exc
l
ude unneces
s
ary op
t
i
o
ns
f
rom
OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
git-f
a
st-impor
t
:
rename cmd_*() func
t
io
n
s to
parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Mik
l
os Vajna
INS
T
ALL: add
a
n
o
te about GNU
interactive to
o
ls
has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
A
d
d tests for sendema
i
l
.
cc configu
r
a
ti
o
n variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klos V
a
j
n
a
gi
t
-send-email: add a ne
w
sendema
i
l
.
cc confi
g
uration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos V
a
j
na
g
it-
f
ormat-patc
h
: ad
d
a
new format
.
cc c
o
nfiguration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
gi
t
checkout: add -t alias for
-
-
track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
d
i
ff options documentation:
r
e
fer to --
d
iff
-
filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os Vajna
contrib/ho
o
ks:
a
d
d
an exampl
e
pre-a
u
to
-
gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
k
l
os Vajna
Documentation/
h
ooks: add
pre-auto
-
gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
git-gc --au
t
o
: add pre-auto
-
gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
D
ocum
e
ntation/git-merge: d
o
c
u
m
en
t
subtree stra
t
egy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos
Vajna
git-gui:
Up
d
ated
Hung
a
r
i
a
n
trans
l
ation (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos V
a
j
n
a
Update Hungarian trans
l
at
i
o
n
.
1
0
0% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Improve t6029 to
c
heck
the real "subtree
"
cas
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
Docume
n
tation/git svn
l
og:
a
dd a note about
t
i
m
e
zones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
M
i
k
los Vajna
D
o
cumentation/git-filter-bra
n
ch: add a
new msg-fi
l
ter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vaj
n
a
git-
c
lean: handle errors
i
f removing files
fai
l
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Mikl
o
s Vajn
a
Doc
u
ment
a
tion/git-st
a
sh: docum
e
nt opti
o
ns for git s
t
a
sh
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
git c
l
one -s do
c
umentation: force a new p
a
r
a
g
ra
p
h for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
M
iklos
V
ajna
b
u
il
t
i
n
-
gc
.
c: gua
r
d config
p
a
r
ser fro
m
value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos
V
ajna
g
i
t
rev-pa
r
s
e
m
anpage: spellin
g
fi
x
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos
V
ajna
g
i
t p
u
ll manpage: don't include -n from fetch-o
p
tions
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
M
iklos Vajna
git-clone -s: docum
e
n
t
problems with g
i
t gc --prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vaj
n
a
In
c
lude r
e
v
-list options in git-log ma
n
page
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
M
i
klos Vajna
l
s-remote: add -t and -
h
opt
i
ons
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklo
s
Va
j
na
A
dd us
i
ng merge subtree H
o
w-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t/t7001: a
v
oid unnec
e
ssary
E
RE
when u
s
ing grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos V
a
jna
g
i
t-sh-set
u
p: document git_editor()
and get_author_i
d
e
n
t_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Mi
k
los
V
ajna
everyday: r
e
place
'pr
u
ne' and 'repack' with 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
i
klos V
a
jna
Update Hungaria
n
translation
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Incl
u
de diff
o
p
t
i
ons in the git-log
manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
M
iklos Vajna
git
-
send-email:
add a
new s
e
ndemail
.
to configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos
V
ajna
git stash: doc
u
ment apply'
s
--index switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
g
it-bundle: fix commandline exa
m
ples in the man
p
age
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Mi
k
los Vajna
U
ser Manual: add a chapter for
submodule
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Mi
k
los Vajna
H
u
n
g
arian
t
ran
s
lation
of
g
it-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklos
Vajna
gitweb:
new cgi
parameter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklo
s
V
ajn
a
gitweb: pref
e
r
git_
g
e
t_p
r
oject_owner
(
) over get_f
i
le_
o
wner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vajna
Docum
e
nt -<n> for git-for
m
at-p
a
t
c
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree