repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin-merge: avoid run_command_v_opt() for recursive and subtree
2008-08-31
M
iklos Vajna
builtin-
m
erge:
avoid run_command_v_opt() for recursive
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s Vaj
n
a
merge-rec
u
rsive:
i
ntroduc
e
merge_op
t
ions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Split out merge_recursive() to m
e
rge
-
recu
r
sive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Miklos V
a
jna
Makefile: enable SNPR
I
NTF_RETURN
S
_BO
G
US f
o
r H
P
-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
M
iklos
Va
j
n
a
Fi
x
'git help h
e
lp'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t9300: repla
c
e '!
'
with
test_
m
u
s
t_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
M
iklos Vajna
Doc
u
m
entation: do
c
ument
t
h
e
pager
.
* conf
i
gur
a
tion setting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
Builtin git-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
b
u
iltin-help: always
l
oad_command_list() in cmd_help()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a s
e
cond te
s
tca
s
e
f
or handlin
g
inva
l
id
strategies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add
a
ne
w
test for using a
c
ust
o
m merge strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos V
a
jn
a
bui
l
tin-merge: al
l
ow using a custom strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os Vajna
b
uil
t
in-he
l
p: mak
e
some internal f
u
nctions available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Mikl
o
s Vajna
t76
0
1: extend
the 'merge p
i
cks u
p
the best
r
e
s
ult'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklo
s
Vajna
b
u
iltin-merge
:
g
i
ve a proper error mess
a
ge
f
or invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
M
iklos Vajna
Teach 'git merge' that
some merg
e
strategies no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add a new test fo
r
git-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klo
s
Vajna
t6021:
a
d
d a
n
ew
t
est for git-merge
-
re
s
olve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
m
a
ke remove
-
dashes: appl
y
t
o
s
c
ripts
a
nd progr
a
ms as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
g
it-b
i
se
c
t: use d
a
sh-le
s
s
f
orm on git bisect
lo
g
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
n
a
t
1007-hash-object
.
sh: use qu
o
tes for
the
test
d
escripti
o
n
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-init
.
sh: ch
a
nge c
o
nfusi
n
g d
i
r
e
c
tory na
m
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Bu
i
ld in
m
erge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
Vajna
Fix t7601-merge-pull
-
config
.
sh on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vaj
n
a
git-co
m
mit
-
tree: m
a
ke
i
t
usa
b
le
f
rom other b
u
iltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Va
j
na
Add new test cas
e
to ens
u
re gi
t
-
m
er
g
e prepen
d
s the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git:
use
g
it init inst
e
ad 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-frot
z
" to "g
i
t f
r
otz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajn
a
hg-to-
g
i
t
: ab
o
rt if
t
he project d
i
rec
t
ory
i
s
not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to
-
git: avoid
r
aising a string e
x
cept
i
o
n
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTALL
:
Update
section about
g
i
t-fr
o
tz 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
Miklos V
a
j
n
a
Add
new
t
est case to ensure git-merg
e
reduc
e
s
oc
t
opus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vaj
n
a
A
d
d new test to ens
u
r
e g
i
t
-
m
erge han
d
les
more th
a
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduce get_oct
o
pus
_
merge_bases() in
c
o
mmit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s
V
ajna
git-fmt-merge-msg: make it
u
sable
f
rom othe
r
builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Move
r
ead_cache_un
m
erged() to read-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los
V
ajna
Add new test to
ensure git-merge handles pull
.
twohe
a
d
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Move pars
e
-optio
n
s's
s
ki
p
_p
r
ef
i
x() to git-compa
t
-uti
l
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
o
ve
c
o
m
mit
_
list_count
(
) to commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move split
_
cmdline() to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Mi
k
los Va
j
na
path-list do
c
umen
t
ation: d
o
cument
all func
t
ions
a
nd
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Mi
k
los Vajna
run
-
command
documentation: fix "memset()" paramet
e
r
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-re
a
d-tree: d
o
cument -v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
iklo
s
Vajna
A sim
p
le scrip
t
to p
a
rse the results from the testcases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos
Vajna
git-
r
eb
a
s
e
-i: men
t
ion the short command aliases in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos Vajna
Remov
e
un
u
sed co
d
e in
p
ars
e
_comm
i
t_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Mi
k
los Vajna
Strbuf documentation: do
c
u
m
e
nt most functi
o
ns
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Mi
k
l
o
s
V
ajn
a
Re
v
ision walk
i
ng documentation
:
document mos
t
important
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vaj
n
a
C
o
d
ingGu
i
delin
e
s: Add a n
o
te t
o
avoid assignments inside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos V
a
jna
git-merge
:
exc
l
u
de unneces
s
ary option
s
from
OPTI
O
NS_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
M
i
kl
o
s Vajna
g
it-fas
t
-
i
m
p
ort
:
rename
cmd
_
*() fun
c
tion
s
to par
s
e_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTALL: add
a
note about GNU
interactive tools
has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Vajna
Add
test
s
for sendemail
.
cc configurati
o
n variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
os Vajna
git
-
send-email: add a new
sendemai
l
.
cc con
f
ig
u
ratio
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mikl
o
s Vajna
git-forma
t
-
p
a
tch: add a new f
o
r
mat
.
cc configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git checkout: add -t alias for --t
r
ack
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vaj
n
a
diff options documentation:
r
efer to --d
i
ff-filte
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
los Vajna
contrib/ho
o
ks: add an examp
l
e
pre-auto
-
gc h
o
ok
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos Vajna
Doc
u
mentation/
h
ooks: add
pre-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mikl
o
s Vajna
git-gc --auto: add
p
re-auto-gc
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos
V
ajna
Documenta
t
ion/git-mer
g
e:
d
ocument subtree strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vaj
n
a
g
i
t-g
u
i: Upd
a
ted Hungarian tr
a
nslation (e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Miklos
V
ajna
Upd
a
t
e H
u
ngarian tr
a
nslation
.
100% comple
t
ed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos
V
ajna
Improve t6
0
29 to ch
e
ck t
h
e real "subtree" c
a
s
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos
V
ajna
Documentation/g
i
t
svn lo
g
:
add a note about timezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
M
ik
l
os Va
j
na
Documentation/git-f
i
lter-branch: add a n
e
w
msg
-
filt
e
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Va
j
n
a
git-clean: ha
n
d
le errors if removing fil
e
s fail
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos
Vajna
Documentat
i
on/git-stash:
d
ocument options for git sta
s
h
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
M
i
klos Vajna
g
it
clo
n
e -
s
d
o
cu
m
entation: force a new
paragraph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos
V
ajna
builtin
-
gc
.
c: guard config par
s
er
f
rom value=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
M
iklos
Va
j
na
git rev-parse man
p
age: spelling fi
x
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
g
i
t
p
u
ll manpage: don
'
t incl
u
de -
n
from fe
t
ch-options
.
tx
t
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-
c
lon
e
-s:
d
ocument p
r
ob
l
ems w
i
th git gc --prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
Inc
l
u
de
r
ev-list options in git-log manpage
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklos
Vajn
a
ls-rem
o
te:
add -t and -h
o
ptions
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
Add usi
n
g merg
e
s
ubtree How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Mikl
o
s Vajna
t
/
t700
1
: avoid unnecessary ERE whe
n
using gr
e
p
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-sh-setup
:
d
o
cum
e
nt git_editor(
)
and get_author_ident_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
every
d
ay:
replace 'prune' and 'repack' w
i
t
h
'
gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Mikl
o
s Vajna
U
pd
a
te
H
ungarian translation
.
100% c
o
mpleted
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
M
i
klos Va
j
na
Include diff options
i
n th
e
git-log
manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
gi
t
-send-e
m
ail: add a new sendemail
.
to
c
on
f
igurat
i
on
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
M
iklos Va
j
na
g
it
s
tash: doc
u
ment
a
pply
'
s --index s
w
i
tch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
git-bundle
:
fix
c
o
mman
d
line exam
p
les in th
e
manp
a
ge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklos
Vaj
n
a
User Manual: add a chapter for
s
u
bmodules
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
M
i
klos Vajna
Hungar
i
an translation
of git-g
u
i
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Mi
k
los Vajna
gitweb: new cgi par
a
m
eter: opt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Mi
k
los
V
a
jna
g
i
t
web: prefer
git_get_project_
o
wn
e
r() over get_file
_
own
e
r
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
M
iklos Vajna
Doc
u
ment -<n> for g
i
t
-f
o
rmat-patch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree