repo.or.cz
/
git
/
vmiklos.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
push: fix local refs update if already up-to-date
2008-10-14
Miklos
Vajna
Add te
s
tc
a
se
t
o e
n
sure
m
ergi
n
g an ear
l
y par
t
o
f
a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
M
iklos Va
j
na
test-lib
:
fi
x
color reset
i
n
sa
y
_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
Vajna
t7
5
01: a
l
ways use test
_
cmp
i
n
stead
of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mik
l
os Vajna
Makefile: add merge
_
recurs
i
ve
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefile:
e
na
b
l
e SNPRI
N
TF_RETURNS_BOGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos V
a
jna
Fix
'
git help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
i
klos Vajna
t9
3
00
:
re
p
lace
'
!' with
test_mu
s
t_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mik
l
os Vajn
a
Documentation
:
document the page
r
.
* co
n
figurati
o
n sett
i
ng
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mik
l
os Vajna
t
7601: ext
e
nd th
e
'merge
pi
c
ks up
the best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Mi
k
los Vajna
b
uiltin-
m
e
r
g
e
: giv
e
a proper error
m
es
s
age fo
r
invali
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
M
iklos
Vaj
n
a
Teach 'git merge' that some merge strate
g
i
e
s
no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
k
los Vajna
Add a new test for git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a
n
ew
te
s
t for git-merg
e
-re
s
olve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Va
j
na
m
ake re
m
ove-da
s
hes: apply t
o
s
c
r
ipts and p
r
og
r
ams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
j
na
git-bisect:
u
se dash-less form
o
n git bisect
log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajna
t1007-hash-object
.
sh: use
quote
s
for the t
e
st description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los Vajna
t0001-init
.
sh: change confusing d
i
rector
y
name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Bui
l
d
i
n merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos Vajna
Fix t7601-m
e
rge-pull
-
co
n
f
i
g
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Vajn
a
git-c
o
mm
i
t-t
r
ee: make it usabl
e
fr
o
m o
t
her buil
t
ins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Vajna
Add new te
s
t case t
o
ensure gi
t
-
m
e
rg
e
p
r
epend
s
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
hg-to-git: use
g
it i
n
it instead of git ini
t
-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
V
a
jna
hg-
t
o-git: rewrite "git-frotz" to "git
f
r
ot
z
"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g-to-
g
i
t:
a
bort if the project
d
irectory i
s
not
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vaj
n
a
hg-to
-
git:
a
void rai
s
i
ng a
s
tring
exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
INSTALL
:
Update section about git
-
frotz for
m
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retire
'stupid' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test case to ensure git-merge 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 test to ensu
r
e git-merge han
d
le
s
more
than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los
V
a
jna
Intro
d
uce get_octopus_merge_bases
(
) i
n
commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-merge-msg: make it usab
l
e
f
rom other builtin
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
o
s Vajna
Move re
a
d_
c
ache_unmerged() to read
-
cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new t
e
st to en
s
ur
e
g
i
t
-
merge handles
p
ull
.
t
wohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vaj
n
a
Move par
s
e
-
o
p
t
ions's s
k
ip
_
pref
i
x() to git-compa
t
-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
ov
e
commit
_
lis
t
_count() to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move split_cmd
l
in
e
() to al
i
as
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mi
k
l
os Vaj
n
a
p
a
t
h-list do
c
umentation:
do
c
um
e
nt
a
l
l functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-
c
om
m
and docum
e
ntation:
f
ix "memset()
"
parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Mi
k
los Vajna
g
i
t-read-tree: do
c
ument -v o
p
tion
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los V
a
j
na
A simple scrip
t
to p
a
rse the results
f
r
om the testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los Vajn
a
gi
t
-rebase
-
i:
m
ention
t
h
e
s
h
ort co
m
mand al
i
ase
s
in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklo
s
Vajna
Remove
unused
code in parse_commit
_
buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
M
i
k
los Vajna
Strbuf documenta
t
ion: do
c
um
e
nt most func
t
ions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Mikl
o
s
V
a
jna
Revision
wa
l
king documenta
t
ion: document mo
s
t important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mik
l
os Vajna
Cod
i
ngG
u
idel
i
nes: Add
a
note to avoid assignments i
n
side
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git-me
r
ge: exc
l
ude unn
e
cessary option
s
from OP
T
IONS_SP
E
C
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
M
i
k
l
os Vajna
git-fast-imp
o
rt: re
n
ame cmd_*() functions to parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
M
iklos Vajna
INSTALL: ad
d
a note
a
bo
u
t
GNU interactive
t
ool
s
has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vaj
n
a
Add tests for sendemail
.
cc config
u
ration
variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klos Vajna
git-send
-
email: add a new send
e
mail
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos Va
j
na
g
it-format-patch: ad
d
a new f
o
rm
a
t
.
cc
configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git
c
he
c
kout:
a
dd -t alias for --
t
r
ack
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklo
s
Vajna
diff options documentation: refer t
o
--d
i
ff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Va
j
na
contrib/hooks: add an example pre
-
auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os Vajn
a
D
o
cumentation/hoo
k
s: ad
d
pr
e
-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
git-gc -
-
aut
o
: add
p
r
e-auto
-
g
c
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
M
i
klo
s
V
ajn
a
Documentatio
n
/git-merge
:
document subtree
strateg
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
git-gui: Updated
Hungar
i
a
n
t
ranslat
i
on (
e
5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Update H
u
n
garian
tr
a
nslation
.
1
0
0
% comple
t
ed
.
commit
|
commitdiff
|
tree
2008-02-29
Mik
l
os Vajna
Imp
r
ove t6029
to check
the real "subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
M
i
k
los Vajna
Do
c
ument
a
tion/git sv
n
log: add a
n
ote about timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
M
i
k
l
o
s
Vajna
Documentation/gi
t
-filter-branch: add a n
e
w msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
M
i
k
los Vaj
n
a
git-clean: han
d
l
e
errors if removi
n
g files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos
V
ajna
D
o
cument
a
t
ion/git-stash:
d
o
c
ument opti
o
ns for git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Va
j
na
git clone
-
s
documen
t
ation: fo
r
ce a new paragraph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
builtin-gc
.
c
:
guard config pars
e
r fr
o
m va
l
ue=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Mik
l
os Va
j
na
git
rev-pa
r
se manpage: spell
i
n
g
f
ix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
git pu
l
l manpage: don't inc
l
ude -n
from fetch-optio
n
s
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos
V
ajna
git-cl
o
ne
-s:
d
ocument
pro
b
lems with
g
it gc
-
-prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos V
a
jna
I
n
c
lu
d
e rev-list
option
s
in git
-
l
og manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls
-
remote: add -t and -h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
M
iklos V
a
jna
Add using merge subtree
H
ow-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
M
iklos Vajna
t
/
t
700
1
: avoid unnecessar
y
ERE w
h
en u
s
ing grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-sh
-
set
u
p:
d
ocume
n
t gi
t
_e
d
itor() and
get_author_ide
n
t_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
M
i
k
l
os
V
ajna
e
v
eryday
:
replace 'prune' and '
r
epa
c
k' with
'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mi
k
los Vajna
U
p
date Hu
n
garian tr
a
nslation
.
100%
c
ompleted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Include d
i
ff
o
ptions in the git-log manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Mi
k
los Va
j
na
git-send-email:
a
d
d a new
s
endemail
.
t
o
conf
i
guration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vaj
n
a
git stas
h
: do
c
ument
a
pply's
--i
n
d
ex s
w
itch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajn
a
git-bundle
:
f
i
x commandline exampl
e
s in the manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Mi
k
los Vajn
a
U
ser Manual
:
add a chapt
e
r for submodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos V
a
jna
H
ungar
i
a
n
tra
n
slation of
git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vajna
gitwe
b
: n
e
w c
g
i parameter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
g
i
tweb: pref
e
r git_get_
p
roject_ow
n
er() over get_
f
i
le_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos
V
ajna
D
o
c
u
me
n
t -<n> for g
i
t-f
o
rmat-
p
atch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree