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
Enhance hold_lock_file_for_{update,append}() API
2008-10-14
Mik
l
os Vajna
Add t
e
stcase to ensure merging an early part of
a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos V
a
jna
t
e
st-lib: fix col
o
r rese
t
in say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t
7
501
:
a
lways
u
s
e test_cmp i
n
s
t
e
ad of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Makefile
:
add m
e
rge_recursiv
e
.
h to
LIB_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefile: enable SN
P
RINTF_R
E
TURNS_BOGU
S
fo
r
HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fi
x
'g
i
t help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Mikl
o
s Vajna
t9300: replace '
!
' with tes
t
_
m
u
st_fai
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos
Va
j
na
Docum
e
nt
a
tion:
d
oc
u
m
e
nt t
h
e
p
ager
.
* conf
i
guration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t76
0
1: extend th
e
'merge picks up the best result
'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Mikl
o
s Vajna
built
i
n-merge: give a proper
e
rror message for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos
V
ajna
Teach '
g
it merge' that
s
ome merge
s
trategies no
l
onger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
V
ajna
Add
a new test for
g
it-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021
:
add a new
t
e
st for
g
it-merge-r
e
solve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make r
e
move-dashe
s
: apply to scripts
a
n
d
program
s
as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisect: use das
h
-les
s
fo
r
m
o
n git
bisect l
o
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vajna
t1
0
0
7-hash-
o
bject
.
s
h
: use quotes for the test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-
i
nit
.
sh:
c
h
a
nge conf
u
sing
d
ir
e
ctory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mi
k
l
o
s
V
ajna
Build in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
k
los Vajna
Fix
t
7601-merge-pull-config
.
sh
on A
I
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Va
j
na
git-commit-tree
:
make it usab
l
e
from o
t
her bu
i
lt
i
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajna
A
dd new test case to ensure git-merg
e
prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vaj
n
a
hg-to-git:
u
se git init instead of git
init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: rewrite
"git-frotz" to "git
f
ro
t
z"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-g
i
t
:
abort if the project direc
t
ory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
hg-to-
g
it: avoid
r
aisi
n
g
a string exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
I
N
STALL
:
Updat
e
section about git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Mi
k
l
o
s
Vajna
Retire 'stup
i
d' mer
g
e strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test case to ensure git-merge reduce
s
octopu
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Add
n
ew test
to ensure git
-
me
r
ge han
d
l
es
more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
o
s Vajna
Introduce get_octopus_m
e
r
ge_bases() in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
git-fmt-merg
e
-
msg:
make it usable from othe
r
builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os
V
aj
n
a
Move r
e
a
d
_cache_unmerged() to re
a
d-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Add n
e
w
t
est to ensure git-
m
erge handles
pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Move
parse-options's s
k
ip_prefix() to git-com
p
at-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move co
m
mit_lis
t
_
count() to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Mov
e
sp
l
it_cmdline() to
a
lias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vaj
n
a
path
-
list do
c
umentation: document a
l
l
f
unctio
n
s and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
i
klos Vajna
run-command
d
ocum
e
n
tatio
n
: fix "memset()" para
m
e
t
er
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Mikl
o
s
Vajna
g
i
t-read
-
t
r
e
e: do
c
ume
n
t -v opti
o
n
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Vajna
A
s
impl
e
scr
i
pt to parse the r
e
sults fro
m
t
h
e
testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos Vajna
g
it-rebase -i: men
t
i
o
n the
sho
r
t command
a
liase
s
in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos V
a
jna
Remove unused co
d
e
in pars
e
_commit
_
buffer
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos
Vajn
a
S
trbuf docume
n
tation:
d
ocument
most
func
t
ions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revision
walk
i
ng d
o
cumentation: doc
u
ment most important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
M
i
k
los Vajn
a
CodingGuidelines:
Add a note to
a
v
oid a
s
sig
n
ments in
s
ide
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos
Vajn
a
g
i
t-
m
erge: ex
c
lude unnecessary
o
p
t
ions fr
o
m OPTI
O
NS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Mi
k
los Vajna
git-fast-
i
mpor
t
:
r
e
n
a
me cmd_*()
f
unctions to pars
e
_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajn
a
I
NSTALL:
a
dd
a
no
t
e about GNU interactive to
o
l
s
has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
os Vajna
A
dd te
s
ts for sendema
i
l
.
cc configurati
o
n variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mikl
o
s V
a
jna
git-
s
end-email: ad
d
a
new se
n
dema
i
l
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-format-patch
:
add a new
f
o
r
mat
.
c
c
confi
g
u
ra
t
ion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
gi
t
che
c
kout: add -
t
alia
s
for --tra
c
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklo
s
Vajna
diff o
p
tions d
o
cumentatio
n
: refer
to --d
i
ff-f
i
lter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
c
o
ntrib/hooks: add an example pre-
a
uto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
V
a
jna
Docum
e
ntation/hoo
k
s: add pre
-
auto-gc
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos V
a
jna
g
it-gc --auto: add p
r
e-a
u
to-
g
c hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
M
i
klos
Vajna
D
ocumentation/git-merge: doc
u
ment s
u
btree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
g
it-gui: Upd
a
ted Hungari
a
n tran
s
l
at
i
on (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Update Hungar
i
an translati
o
n
.
1
00
%
completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos
V
ajna
Improve t60
2
9
to check the real "subtree
"
c
a
se
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
M
iklo
s
Vajna
D
ocumen
t
ation/git svn log: a
d
d
a note about
t
i
mezo
n
es
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos
V
a
j
n
a
Documentat
i
on/git-filter-bran
c
h: a
d
d a new msg-
f
ilter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
g
i
t-clean:
h
a
n
dle errors
if remov
i
n
g
files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
M
i
klos Vajna
D
o
cumentation/git-stash: document
options for git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklo
s
Vajna
git cl
o
ne
-
s
doc
u
ment
a
tion: for
c
e a new paragr
a
ph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklo
s
V
a
jn
a
builtin-gc
.
c: guard config
p
a
r
ser from value
=
NUL
L
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Va
j
na
git r
e
v-parse manpage: spelling
f
ix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos V
a
jna
git pull manpage: do
n
't in
c
lude -n from fetch-options
.
tx
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-
c
lone -s: document problems with git
gc --prun
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
M
iklos V
a
jna
Include
rev-list options in git-log manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls-remote: ad
d
-t and -h optio
n
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos
Vajna
A
dd
u
sing merge subtree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vaj
n
a
t/t7001: avoid unnecessar
y
E
R
E when us
i
ng
g
re
p
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git
-
sh-setup:
d
ocument git_editor() and get_author_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
everyday: replace '
p
r
une' an
d
'repack' with 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklo
s
Vajna
Update
Hungarian transla
t
ion
.
100% com
p
leted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
iklo
s
Vajna
I
nclude dif
f
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-send-email: add
a
new sendemail
.
t
o configurat
i
on
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Mi
k
lo
s
Vajna
git
s
t
ash: docum
e
nt apply's --i
n
dex
s
witch
commit
|
commitdiff
|
tree
2007-09-29
Miklos V
a
j
na
g
it-bundle: fix commandline example
s
in
t
he manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Mik
l
os
V
ajna
U
ser Manu
a
l:
ad
d
a ch
a
pt
e
r for submo
d
u
l
es
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hun
g
ari
a
n translation
of git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
M
i
klo
s
Vajna
gitweb: n
e
w cgi parameter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
gitweb
:
prefer git_get_pr
o
ject_owner() over get_file_owne
r
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vajna
Document
-
<n
>
f
or
git-format-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree