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
rename_ref(): handle the case when the reflog of a ref does not exist
2008-10-26
Miklos Vajna
rename_ref(
)
: handle the
c
ase wh
e
n the reflo
g
of
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mi
k
los Vajna
Fix
g
it bran
c
h
-
m
f
or sym
r
efs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mik
l
os V
a
jna
Add testcase to e
n
sure merging an early part of
a
branc
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Mik
l
os Vajna
te
s
t-lib:
f
ix color
r
eset i
n
s
a
y_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
os V
a
jna
t7501:
a
lways use test_cmp
instead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
i
klos Vajna
Makefil
e
:
a
dd merge_recursive
.
h to L
I
B_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajn
a
Makefile
:
enable SNPRINTF_RETURN
S
_BOGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
M
i
kl
o
s
V
ajna
Fix 'gi
t
h
elp
h
e
lp'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
ikl
o
s Vajna
t9300
:
replace
'!' with te
s
t_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos
Vajna
Documentation: document the p
a
ger
.
* configura
t
ion setti
n
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601:
ext
e
n
d the 'merge picks up t
h
e best r
e
sul
t
'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-merge: give
a
pr
o
per error mes
s
a
g
e for
i
nva
l
id
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach
'git
merge' that some merge strateg
i
es no
l
onger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
V
a
jna
A
dd
a
new
test
f
o
r g
i
t
-
m
e
rge-re
s
olve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
kl
o
s Vajna
t
6
021: add a n
e
w test f
o
r
git-mer
g
e
-
resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
make
remove-d
a
shes:
a
pply
t
o scripts and prog
r
ams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vajna
g
i
t-bisect: use dash-less form
on git bis
e
ct lo
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-hash-
o
bject
.
sh: use quote
s
for the
t
est descrip
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-init
.
sh
:
chan
g
e confusing dire
c
tory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Bui
l
d in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix t7601-m
e
rge-pull-c
o
nfig
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
ajna
git-commit-tree:
m
ake it usable from other
bui
l
t
i
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos
V
ajna
Add new te
s
t
case to ensure git-merge prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git
:
us
e
git init instea
d
of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg
-
to-git: rewri
t
e "gi
t
-
f
r
otz" to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
hg-t
o
-git: abo
r
t if
t
h
e
pr
o
jec
t
di
r
e
c
to
r
y
i
s not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
hg-to-git: avoi
d
raising a string exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTALL: Update
s
ection ab
o
ut git-frot
z
form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
M
i
k
l
o
s
Vaj
n
a
R
e
t
ire 'stupid' merge strate
g
y
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
d
d new test case to
e
nsure git-merge reduces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add
n
ew test
t
o ensure git-merge handles mor
e
t
ha
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
lo
s
Vajna
Introduce get_octopus
_
merge_bases() in
c
o
mmit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
g
i
t-fmt-
m
erge-msg:
make it usable from other b
u
iltins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
los
Vajna
Mo
v
e re
a
d
_
cache
_
unmer
g
e
d
(
)
to rea
d
-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new tes
t
to ensur
e
git-
m
er
g
e handles pull
.
t
w
o
h
ead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
M
ov
e
par
s
e
-op
t
i
ons's ski
p
_pr
e
f
i
x(
)
to git-compat-uti
l
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Move commit_list_count() to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move
s
p
lit_cmdline() t
o
alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
V
ajna
path-list do
c
ume
n
tation:
do
c
umen
t
all functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajn
a
run-
c
ommand do
c
umenta
t
i
o
n: fix "memse
t
()" param
e
te
r
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos
V
ajna
git-r
e
ad-tree: document -v opt
i
on
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A
simpl
e
script to parse
the res
u
lt
s
from the
test
c
ases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
os Vajna
git-r
e
base -
i
: mention
the short com
m
and aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklo
s
Va
j
na
Remove unused cod
e
i
n parse_commit_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklo
s
Vajna
Strbuf documentat
i
o
n:
d
o
cument most
f
unctions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revi
s
ion
w
a
lk
i
ng documentatio
n
: docum
e
n
t most im
p
o
rtan
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
Codi
n
gG
u
idelines: Add a
note to
avo
i
d a
s
signments inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git-mer
g
e: exclude unnecessary options from OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos
V
ajna
git-f
a
st-i
m
por
t
:
rename
cmd_*() functio
n
s
to parse_*(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
M
iklos Vajna
I
N
S
T
A
L
L: add
a
note about GNU interact
i
ve tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
A
d
d te
s
t
s
for sendemai
l
.
cc configura
t
i
on variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos
V
ajna
gi
t
-send-email: add
a
ne
w
sendemai
l
.
c
c
conf
i
gurat
i
on
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-format-patch: add a new form
a
t
.
cc c
o
nfigu
r
a
t
ion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
M
i
klos Vajn
a
git
c
heckout: a
d
d -t alias for -
-
track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
M
i
kl
o
s Vajn
a
diff optio
n
s docume
n
tation: refer
t
o --diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
cont
r
ib/
h
o
o
k
s
:
add an ex
a
mple
pre-
a
uto-
g
c hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
o
s
V
a
j
n
a
Document
a
tion/hooks: add p
r
e-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
gi
t
-gc --aut
o
: add pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Documen
t
ation/git-merge: document su
b
tre
e
strat
e
g
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajn
a
gi
t
-gui: Updated Hungarian transla
t
ion (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Va
j
na
Up
d
at
e
Hungarian translation
.
100% co
m
pleted
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Impro
v
e t6029
t
o c
h
eck the re
a
l "subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
D
ocumentation/git svn l
o
g: add a
n
ote about timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Mikl
o
s Vajna
Doc
u
menta
t
ion
/
git-filte
r
-br
a
nch:
a
dd a new msg-fi
l
ter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
g
i
t
-clean: handle err
o
rs if
removing f
i
les fail
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
M
i
kl
o
s
Vajna
Docume
n
tation/
g
it-stash: document options for gi
t
st
a
sh
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Va
j
n
a
git
clone -s documenta
t
i
o
n: forc
e
a new para
g
raph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
bu
i
ltin-gc
.
c: guard con
f
ig pa
r
ser fr
o
m value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Mi
k
los Vaj
n
a
git r
e
v-par
s
e manpage: spelling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklo
s
Vajna
git
p
ull m
a
npage:
don't include
-n from fetch-option
s
.
tx
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos
Vajna
git-
c
lone -s:
d
o
c
ume
n
t problems wi
t
h
git gc
-
-
p
rune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos
V
ajna
Inc
l
ude rev-l
i
st options in g
i
t-log
manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
M
iklos
V
ajna
ls-remote: add -t and -h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Va
j
na
Add
u
s
i
ng merge subtree How
-
To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
M
iklos
V
ajna
t/t7
0
01
:
avoi
d
unne
c
e
ssary ERE whe
n
using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
g
i
t-sh
-
setup: documen
t
git_editor() and get_
a
uthor_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklo
s
Vajna
everyday: replace
'prune' and 'repack' with 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mi
k
lo
s
Vajna
Upda
t
e Hunga
r
ian translation
.
100
%
completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
V
ajna
Inc
l
ude diff option
s
in the g
i
t-log manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos V
a
jna
g
it-send-email: add a new se
n
demail
.
to configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git
s
tash: do
c
ument
a
pply's -
-
index swi
t
ch
commit
|
commitdiff
|
tree
2007-09-29
Mi
k
los Vajn
a
g
i
t-bundle: fix commandline e
x
amples in the manp
a
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
M
i
k
l
os Vaj
n
a
U
ser Ma
n
ual: add
a cha
p
t
er f
o
r submodu
l
es
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Mik
l
os Vajna
Hungarian tra
n
slation of g
i
t-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklos
V
ajna
gitweb: new
c
gi parame
t
er
:
opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Mi
k
l
o
s Vajna
gitweb: prefer
g
i
t_get_project_ow
n
er() over ge
t
_file_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
M
iklos Vajna
Document -<n
>
for
g
it-format-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree