repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'fg/maint-1.6.0-exclude-bq' into maint-1.6.0
2008-12-20
Mi
k
los Vajna
Sub
m
it
t
ingPatc
h
e
s
:
mention the usage of real name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklo
s
Vajna
http
.
c
:
use 'git_config
_
string' to ge
t
'c
u
rl_h
t
tp_p
r
oxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Mi
k
los Vajn
a
Us
e
r's Manual:
r
emove duplicated u
r
l
a
t the end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Vajna
Ad
d
n
ew t
e
stcase to show fa
s
t
-
export does n
o
t
always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Mik
l
o
s
Vajna
u
p
d
ate-ref --no-d
e
ref -d: handle t
h
e case wh
e
n th
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
M
iklo
s
Vajna
git branch -m: forb
i
d
renamin
g
o
f a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
klos Vajna
Fix git
update-ref
-
-no-d
e
ref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
iklos V
a
jna
rename_ref(): handle the cas
e
when the reflog of
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklo
s
Vajna
Fix git branch
-
m for sym
r
efs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add testcase to
e
n
s
ure mer
g
ing an early part of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos
V
ajna
test-lib: fix
co
l
or re
s
et in say_
c
olor()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Vajna
t75
0
1
: always use test_cmp
i
nst
e
ad of dif
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mi
k
los Vajna
M
a
kefile: add merg
e
_r
e
c
u
r
si
v
e
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
M
i
klos
Vajna
Makefile: enable
S
NPRI
N
TF_RETURNS_BOGUS fo
r
HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
F
i
x 'g
i
t help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t
9300: re
p
lac
e
'!'
with test
_
must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
D
o
cumentation: do
c
ument the pager
.
* configuration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
M
iklos Vajna
t
7601: ex
t
e
nd th
e
'merg
e
picks
up the
best resu
l
t'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
i
klos Vajna
builti
n
-merge: giv
e
a
p
rope
r
error m
e
ss
a
ge for
invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mikl
o
s Vajn
a
Teach 'g
i
t merge'
t
hat some merge strate
g
i
e
s no lon
g
er
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
os
V
ajna
A
dd
a
new
t
est for gi
t
-m
e
rg
e
-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vaj
n
a
t6021:
a
d
d a
n
ew test fo
r
gi
t
-m
e
rge-resolv
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajna
make remove-dash
e
s: apply to
s
cripts an
d
programs
as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bise
c
t: use d
a
sh-less form
o
n git
bisect l
o
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los Vaj
n
a
t1007-has
h
-object
.
sh: use quot
e
s fo
r
the t
e
st description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vaj
n
a
t000
1
-
init
.
sh: cha
n
g
e
confusing dir
e
ctory
n
ame
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
iklo
s
Vajna
Build in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
F
i
x
t76
0
1
-m
e
rge-
p
ull-
c
onfig
.
sh on
A
IX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
git
-
commit-tree: ma
k
e it
u
s
a
ble
fr
o
m
oth
e
r
b
ui
l
tins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
Vajna
Add new t
e
s
t
case
to ensure gi
t
-merge pr
e
pend
s
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
a
jna
hg-to-git:
u
s
e
gi
t
init instead of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
h
g-to-git: r
e
write "gi
t
-frotz" to
"
git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-
g
i
t
: abort if the pro
j
ec
t
directory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
hg-
t
o-git: avoi
d
raisi
n
g a stri
n
g
exce
p
tion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s
Vajna
INSTALL:
U
pdate section abo
u
t
git-frot
z
form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
M
i
klo
s
V
ajna
R
e
tire 'stupid' me
r
ge st
r
ateg
y
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Va
j
na
A
d
d
n
ew
test case to ensur
e
git-
m
erge re
d
uces oct
o
pus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Add ne
w
t
e
st
t
o ensure
g
it-me
r
ge han
d
les more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Introdu
c
e
ge
t
_octopus_
m
erge_bases() in com
m
it
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-merge-msg:
m
a
k
e it
u
sable f
r
om other
buil
t
ins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
kl
o
s Vajna
Move
r
e
a
d_cach
e
_unmerge
d
()
t
o read-
c
ache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test
t
o ensure git-merge handles pull
.
t
w
ohe
a
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
j
na
Move parse-options's skip_pr
e
fix() to
g
it-c
o
mpat-uti
l
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
n
a
Move commit_
l
i
s
t
_count(
)
to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Move spli
t
_cmdline() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vaj
n
a
path-
l
ist documentation: document all fun
c
tions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
i
klos Vajn
a
run-command
d
ocumenta
t
i
on:
f
ix "m
e
m
set
(
)" paramete
r
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read-tree: d
o
c
ument -v
option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos V
a
jna
A
s
imple script to parse
t
he re
s
ul
t
s from th
e
t
estcase
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
git-
r
e
base -i: mention the short comman
d
alias
e
s in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s Va
j
na
R
emove unu
s
e
d
code
i
n pars
e
_commit_bu
f
fer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos
V
aj
n
a
Strbuf docum
e
nt
a
tion: do
c
umen
t
most functi
o
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revision walking documentation: document most important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajn
a
C
odingGuidelines: Add a note to avoid a
s
s
i
gnments
i
n
s
ide
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
M
iklos Vajna
git-m
e
rge: ex
c
lude unn
e
cessary
options from OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Mik
l
os Vaj
n
a
git-f
a
st
-
impo
r
t: re
n
a
m
e cmd
_
*() functions to pa
r
se_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
IN
S
TALL: add a note about GNU
inter
a
ctive
t
ools h
a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos
V
a
j
na
Add
t
est
s
f
or sendemail
.
cc con
f
iguration variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
V
a
jna
g
it-s
e
n
d
-email: a
d
d a new se
n
demail
.
cc
configura
t
ion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git
-
format-p
a
tch: add a new format
.
cc conf
i
guratio
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
g
it c
h
ec
k
out: add
-t
a
lias for -
-
track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mikl
o
s Va
j
na
dif
f
options docu
m
e
n
t
ation: refer to --
d
iff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
V
ajna
cont
r
ib/h
o
oks: add an ex
a
mple pr
e
-auto-gc
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os Vajna
Docum
e
n
t
at
i
on/hoo
k
s: add p
r
e
-
auto-gc
hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mikl
o
s
V
ajna
git-gc --auto:
add pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklo
s
Vaj
n
a
Documentation/git-mer
g
e: docu
m
ent
subtree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Mi
k
los
V
aj
n
a
git-g
u
i:
U
p
dated
H
ungarian
tra
n
sl
a
t
i
on (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Va
j
na
Update Hungarian translation
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos
Vajna
Impro
v
e t6029 to check
t
he real "s
u
btree" c
a
se
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklo
s
Vaj
n
a
Documenta
t
ion/
g
it svn
l
og: add a note abo
u
t timez
o
nes
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
M
i
klos
Vajna
Documentation/gi
t
-
fi
l
te
r
-br
a
nch:
a
dd a new msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Mikl
o
s Va
j
na
g
i
t
-cle
a
n: handl
e
erro
r
s if rem
o
v
i
ng
fi
l
es fa
i
ls
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajn
a
Documentat
i
on/git-stash:
d
ocument options for git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos
V
ajna
g
i
t
clone -
s
documentation: force a
n
ew para
g
raph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Mi
k
los Vajna
builtin
-
gc
.
c
: guard config
parser fro
m
value=
N
ULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git rev-parse man
p
age
:
s
p
e
lling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos
Vajna
git pull
manpage: do
n
'
t
include -n from fet
c
h-o
p
tions
.
t
x
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vaj
n
a
git-clone
-
s: document
p
r
o
blems
w
ith git gc --p
r
une
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajn
a
Include rev-lis
t
opti
o
ns in git-log manpa
g
e
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls-remote: add -t and -h
o
ption
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklo
s
Va
j
na
Add
u
s
ing
m
erge
s
ubt
r
ee How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t
/t7001: avo
i
d unn
e
cessary
E
R
E
whe
n
usi
n
g grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Mik
l
o
s Vajna
g
i
t
-sh
-
setup: document git
_
e
d
itor() and get_author_ident_
f
r
o
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
eve
r
yday: replace 'prune' and 'repack' with 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mik
l
os V
a
jna
Update Hungari
a
n
translation
.
100% comple
t
ed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
iklos Vajn
a
I
nclude diff opt
i
ons in the git-log
m
anpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Mikl
o
s
V
a
j
n
a
g
it-send-emai
l
: add a new sen
d
e
mail
.
to
c
onfigurati
o
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Mikl
o
s Vajna
gi
t
st
a
sh: do
c
u
m
ent appl
y
's --ind
e
x s
w
itch
commit
|
commitdiff
|
tree
2007-09-29
M
i
k
l
os Vajna
git-bun
d
le:
fix
commandline exa
m
p
l
es i
n
the manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklo
s
Vajna
User
Manual: add a chap
t
er for submod
u
l
es
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
M
i
klos
Vajna
Hu
n
g
a
r
i
an tr
a
nslatio
n
of git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vajna
gi
t
web: new cgi parameter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos
Vaj
n
a
gitweb: prefer git
_
get_p
r
oj
e
ct_ow
n
e
r
() over get_file_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Mik
l
os Va
j
na
D
o
cument -<n
>
for git-forma
t
-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree