repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Split out merge_recursive() to merge-recursive.c
2008-08-31
Mi
k
l
os Vajna
Split
o
ut merge_recursiv
e
() to merge-recursi
v
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklo
s
Vajna
Makefile: enable
S
N
PR
I
NTF_
R
ETURNS_BOGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fi
x
'git help
he
l
p'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t9300: replace '!' with test_mu
s
t_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos
V
a
j
na
Documentat
i
on: document the pager
.
* configuration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
M
iklos V
a
jna
Builtin git-hel
p
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
builti
n
-help: always lo
a
d_co
m
man
d
_lis
t
() in cmd_hel
p
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a sec
o
nd testcase for handling
invalid strat
e
g
i
e
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
na
Add
a new
t
e
st fo
r
using
a cus
t
om merge
strateg
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vaj
n
a
builtin-m
e
rge: a
l
low using a custom strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Vaj
n
a
builtin-
h
elp: make so
m
e internal f
u
nctions a
v
a
i
l
ab
l
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vaj
n
a
t7601: extend the 'merge
p
icks up the best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vaj
n
a
built
i
n-
m
erge: give a proper e
r
ror messa
g
e f
o
r
i
nvalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos
Vajna
Teach 'gi
t
merge' t
h
at some
merge str
a
t
eg
i
es n
o
longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add a new
test for git-merg
e
-
r
e
s
olv
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos Vajna
t
6021: add a new t
e
st
f
o
r
gi
t
-merge-r
e
so
l
ve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajna
mak
e
re
m
o
ve-dashes:
a
pply to
s
cripts and programs
as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Vajna
git
-
b
isect: use
d
ash-less form on git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
t1
0
07-hash-object
.
sh: us
e
quotes for
t
h
e
t
e
st descri
p
t
i
on
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
ikl
o
s
V
ajna
t00
0
1-init
.
s
h
: change c
o
nfusing
directory
name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build
in
m
er
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix t7601-mer
g
e-pull-config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
k
los Vajna
git-comm
i
t
-
tr
e
e: make it usable from
o
ther buil
t
ins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajna
A
d
d
new test c
a
s
e to ensure gi
t
-merge prepends th
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
jna
hg-t
o
-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
Mik
l
o
s
Vajna
h
g
-to-gi
t
: rewrite "
g
it-frotz" to "
g
it frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajn
a
hg-to-git: abort if the
p
roject dir
e
ctor
y
i
s not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
hg-t
o
-git: avoid rais
i
ng
a
string exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
o
s
Vajna
I
NSTA
L
L: Update section ab
o
ut
git-
f
rotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Mi
k
los Vajna
R
e
ti
r
e 's
t
upid' merge st
r
ateg
y
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Add new test cas
e
to e
n
s
u
re g
i
t
-
m
e
rg
e
redu
c
es octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
l
os V
a
jna
A
dd new
te
s
t to
e
nsure
git-merge hand
l
es more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
I
ntroduce
get_octopus
_
merge_bas
e
s() 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: make it usab
l
e
from othe
r
builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mo
v
e read_c
a
che_unm
e
rg
e
d() to
r
ead-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos V
a
jna
Ad
d
new tes
t
to ensure
git-m
e
rge handles pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move parse-op
t
ions's skip
_
prefix() t
o
git-c
o
mpat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move com
m
it_list_co
u
nt() to com
m
it
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Move
s
plit_
c
mdline() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mikl
o
s Vajna
path-list documentation
:
do
c
u
m
e
n
t all fu
n
ctions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
i
k
los Vajna
run-
c
o
mm
a
nd do
c
u
m
entation: fix "memset()
"
parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Mi
k
los Vajna
gi
t
-read-tree
:
d
o
c
u
m
ent
-
v optio
n
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Va
j
na
A simple
script to pa
r
se the resu
l
ts fro
m
th
e
t
e
stc
a
s
es
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
g
it-re
b
ase -i: mentio
n
the short command aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s
Vajna
R
e
move unused co
d
e in parse_co
m
m
i
t_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
M
i
klos
Vajna
Strbuf doc
u
mentation: documen
t
most
f
u
n
c
t
ion
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
iklos Vajna
Revision w
a
lki
n
g documentation: document most i
m
portan
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mi
k
los Vajna
C
o
dingG
u
ideli
n
es: Add a no
t
e to avo
i
d assignments
inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklo
s
Vajna
git-mer
g
e
: exclude unnecessary
options from OP
T
I
O
NS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
gi
t
-fast-import:
r
ename cmd
_
*() f
u
nctions
to
parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INST
A
L
L
:
add a note ab
o
u
t
GNU in
t
eractive t
o
ols
h
as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos Vajna
A
d
d t
e
sts
f
o
r
sendemail
.
c
c
con
f
iguration vari
a
ble
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
a
jna
git-se
n
d
-
e
mail: add a ne
w
se
n
demail
.
cc c
o
nfiguration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
g
it-format
-
patch: add
a
n
ew forma
t
.
cc confi
g
uration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
M
iklos
V
ajna
git checkout:
a
dd -t alia
s
for --track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mi
k
los Vajna
di
f
f options documentation: refer to --diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Va
j
n
a
c
ontrib/hoo
k
s: add an
e
xam
p
le
p
re-aut
o
-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
V
a
j
na
D
o
c
u
mentation/hooks: add pre-auto-g
c
h
ook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
Vajna
git-gc --auto: add pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
D
ocument
a
tion/
g
it-
m
erg
e
: document subtree st
r
ategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
M
i
klos Vajna
git-gui: Upda
t
ed Hu
n
g
a
rian translation (e5fb
a
18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos
V
a
jn
a
Update Hungarian
t
r
a
n
slatio
n
.
100% complete
d
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos
V
ajna
I
mprove t6029
t
o
check the rea
l
"
s
u
b
tree"
c
ase
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos V
a
jna
Documentation/g
i
t sv
n
log: add a note
a
b
o
ut
t
imezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Mikl
o
s Vajna
Documenta
t
ion/
g
it-filter-branch: a
d
d a new
m
sg-f
i
lte
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-clean: handl
e
er
r
ors if
r
emoving files f
a
ils
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Mik
l
os Vaj
n
a
Documenta
t
ion/git-stash: doc
u
ment
options for git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos
V
a
jna
git clone -s documentation: fo
r
ce a
new paragr
a
ph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vaj
n
a
buil
t
i
n-gc
.
c: guard config parser fro
m
v
a
lue=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos
V
ajna
git r
e
v
-
parse
m
anpage: spell
i
ng fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
M
i
kl
o
s V
a
j
na
git pull m
a
npa
g
e: don't include
-n fro
m
f
e
tch-optio
n
s
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Mikl
o
s
V
ajna
git-cl
o
ne -
s
: doc
u
ment
p
roblems with git gc --pru
n
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Mikl
o
s
V
ajna
In
c
lude rev-list optio
n
s in git-log manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Mi
k
los
V
ajna
ls-remo
t
e: add -
t
and -h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Mikl
o
s Vajna
Add using merge subtr
e
e Ho
w
-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos
V
ajna
t
/
t7001: avo
i
d
unnecessary ERE
wh
e
n
using
grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos
V
aj
n
a
git-sh-set
u
p: docume
n
t gi
t
_
e
dito
r
() and get_a
u
t
hor_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos V
a
jna
everyday: repl
a
ce 'prune' a
n
d 'repack' wit
h
'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update Hu
n
garian tra
n
sla
t
ion
.
1
0
0
%
completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mikl
o
s Va
j
na
Incl
u
de diff options in the git-log manp
a
ge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
M
i
klos Va
j
na
git-se
n
d-email: add
a new send
e
mail
.
to configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
g
i
t stas
h
: document apply'
s
-
-index switch
commit
|
commitdiff
|
tree
2007-09-29
Mikl
o
s Vajna
git-bu
n
dle: fix commandlin
e
e
x
amples
in
t
he manp
a
ge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
U
ser Manual: add
a
chapter for submodule
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Mikl
o
s Va
j
na
Hungarian trans
l
at
i
on of gi
t
-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
M
i
klos Vajna
gi
t
web: new cgi parameter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Mi
k
los V
a
jna
gi
t
web: prefer git_get_
p
roject_own
e
r() over get_
f
ile_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos
Vajna
Documen
t
-<
n
>
f
or
g
it-format-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree