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 git://git.kernel.org/pub/scm/gitk/gitk
2008-08-16
Miklos Vajna
Documen
t
ation:
d
ocument t
h
e pager
.
* configurati
o
n
setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mik
l
o
s
V
ajn
a
t7
6
01: extend the 'merge picks
up the best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
i
klos V
a
jna
buil
t
in-merge: give a
proper
err
o
r
m
e
ssage fo
r
in
v
ali
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
los V
a
j
na
Teach 'git merge'
t
hat some
m
erge strategies
n
o longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
Vajna
Add a
n
ew t
e
st f
o
r git
-
mer
g
e-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t
6
021: add a new
t
e
st for g
i
t-m
e
rge-res
o
l
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jna
make remove-dashes: ap
p
ly t
o
scripts and p
r
ograms as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vaj
n
a
git-bise
c
t: us
e
da
s
h-
l
ess form on git
bise
c
t log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jna
t1007-hash-
o
bject
.
sh: use qu
o
tes f
o
r
t
h
e test de
s
crip
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
t
0
00
1
-init
.
sh:
c
hange confusing directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklo
s
Vajn
a
Build i
n
me
r
ge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos
V
ajna
Fix t760
1
-mer
g
e-pull-config
.
s
h o
n
AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos
V
a
jna
gi
t
-commit-tree: mak
e
it usable f
r
o
m other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
A
d
d new test case to
ensure git-merge prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
hg-to-git: use git init i
n
stea
d
of
g
it init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
lo
s
Vajna
hg-to-git: rewrite "git-frotz" t
o
"git frotz
"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
h
g
-to
-
git: a
b
ort if
t
h
e project direc
t
ory is not
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vaj
n
a
hg-to-gi
t
:
av
o
id rai
s
ing
a string except
i
on
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTALL:
U
pda
t
e section about
git-frot
z
form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Ret
i
re '
s
tupid' merg
e
strateg
y
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Add new
te
s
t case to ensure git
-
m
e
rge reduc
e
s octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Add new test
t
o
ensur
e
git
-
merge
h
andles more
t
h
an
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduce get_
o
ct
o
p
us_
m
erge_bases() in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
g
it-fmt-merg
e
-msg: make 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
Move
read
_
cache_unmerged() to read-cach
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Ad
d
new tes
t
to ensure git
-
mer
g
e handl
e
s
p
ul
l
.
t
w
ohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move parse-o
p
tions's skip_
p
re
f
ix() t
o
git-
c
o
mpat-ut
i
l
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move
c
ommit_list_
c
ount() to
commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
M
o
ve split_c
m
dli
n
e() to a
l
ias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
pat
h
-list documentation: documen
t
al
l
functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-comma
n
d docume
n
tatio
n
: fix
"mem
s
e
t()" pa
r
ameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Mikl
o
s Vaj
n
a
git-read-
t
ree: doc
u
m
e
n
t
-v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
os Va
j
n
a
A
s
imple script to parse the re
s
u
l
ts
f
r
om
t
he t
e
stc
a
s
e
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s
V
aj
n
a
git-re
b
ase -i: mention
t
he shor
t
command al
i
ase
s
in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Vajna
Rem
o
ve unuse
d
cod
e
i
n
p
arse_commit_buffe
r
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajn
a
Strbuf d
o
cument
a
t
i
on: docu
m
ent mos
t
functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vaj
n
a
R
e
v
ision walkin
g
documentation
:
document m
o
s
t
important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
M
i
klos Vajna
Coding
G
uidelines: Add a not
e
to a
v
oid assignme
n
ts insi
d
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
g
it
-
merge: exclude
u
nnecessa
r
y option
s
fr
o
m
O
PTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Mik
l
o
s Vajna
git
-
fast-import: rena
m
e cmd_
*
() functio
n
s to parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklo
s
Vajna
INSTA
L
L
:
a
dd a
n
o
te ab
o
ut GNU interactive
tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Vaj
n
a
A
dd
t
es
t
s for sendemail
.
cc configu
r
ation var
i
abl
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
gi
t
-send-email:
a
dd a new s
e
n
de
m
ail
.
c
c
configuratio
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klos Vajna
git-
f
orma
t
-
p
atch: add a new format
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
M
i
klos Vajna
git chec
k
out:
add
-
t alias fo
r
--track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos
Vajna
diff options docu
m
entation:
ref
e
r to -
-
diff
-
filt
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
c
ont
r
ib/ho
o
ks: a
d
d
an example pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
iklos Vajna
Documentation/h
o
oks:
a
dd pre-auto-gc hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
los Vaj
n
a
g
i
t
-
gc --auto: add pre-au
t
o-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Documentation/git
-
merge: document subtree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklo
s
Vajna
git-gu
i
: Updated Hun
g
arian
t
rans
l
ation (e5fba1
8
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos
V
a
j
na
Upda
t
e Hungarian
t
r
an
s
lat
i
o
n
.
10
0
% c
o
mpleted
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos
Vajna
Imp
r
ove t6029 to
ch
e
ck the real "su
b
t
r
ee" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos
Vajn
a
Do
c
umentati
o
n/git svn
l
og: add a
note a
b
out timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Do
c
um
e
n
tat
i
on/git-filte
r
-
b
ranch
:
add a new msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Mikl
o
s
V
ajna
g
i
t-clean: handle errors if
r
emo
v
ing files f
a
ils
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos
Vajn
a
Documentati
o
n
/g
i
t-s
t
ash: document opt
i
ons
f
or git sta
s
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajn
a
git
clone -s
d
ocumentation: force a n
e
w
paragraph
for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Mi
k
l
o
s
Vajna
builtin-gc
.
c
: guard co
n
fig parser from value
=
NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajn
a
git rev-parse ma
n
page
:
spe
l
lin
g
f
i
x
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
M
i
k
los Vajn
a
git p
u
ll ma
n
pa
g
e: don't include
-
n from fetch-
o
p
t
ions
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
M
iklos V
a
j
n
a
git-c
l
o
n
e
-s: document
p
roblems with git gc
-
-prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos
Vajna
I
nclude re
v
-li
s
t options in
git-log manpa
g
e
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls-r
e
mote: add -t
and -h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos
V
ajna
Add using merge subtree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Mik
l
os Vajna
t/t
7
0
0
1: avoid un
n
ece
s
sary ERE
w
hen using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Mik
l
os Vajna
git-sh-setup:
doc
u
ment git_
e
d
i
t
o
r() and get_
a
uthor_ident_
f
ro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
M
i
k
l
os
Vajna
e
veryday: replace 'prune'
a
nd
'
repa
c
k' with 'g
c
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Updat
e
Hungar
i
an tra
n
slation
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
i
klos
Va
j
na
Incl
u
d
e
dif
f
option
s
in t
h
e git-log
m
an
p
ag
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
M
i
klos
Vajna
git-send-ema
i
l
: add a new sendemai
l
.
t
o
c
o
n
f
i
gurati
o
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos V
a
jna
git
stash: document apply's --index switc
h
commit
|
commitdiff
|
tree
2007-09-29
Mik
l
o
s
Vajna
git-bundle: f
i
x command
l
i
n
e
exam
p
les in the
manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
M
i
klos
Vajna
User Manua
l
:
a
d
d
a chapter
f
or
submodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Mikl
o
s
Vajna
Hungari
a
n trans
l
ation of git-
g
ui
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
Miklos Vaj
n
a
g
i
t
web: prefer git_get_project_owner
(
) over
g
et_file_
o
wner(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vajna
Docu
m
ent -
<
n> for git-fo
r
mat-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree