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
Add support for a pdf version of the user manual
2008-12-11
Miklos
V
ajna
Add
su
p
port for a pdf v
e
r
sion o
f
t
he user manu
a
l
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-07
Mi
k
los V
a
jna
h
ttp
.
c: use 'g
i
t_config_str
i
n
g
'
to
g
et 'curl_http_proxy'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s Vajn
a
submodule:
us
e
git
r
ev-parse
-q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajn
a
rebase:
u
s
e
g
it
r
e
v-parse
-
q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
pull: use git rev-parse
-
q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajna
lost-found:
u
se git rev-pa
r
s
e -q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
Vajna
filter
-
branch: use git
r
ev-p
a
rse -q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
o
s
V
ajn
a
git-s
t
ash: use git rev-parse -q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-02
Mikl
o
s Vaj
n
a
U
ser's Manual: remove dupli
c
ated url at the
end of
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-25
Mi
k
los Vajna
builtin_clone: use st
r
buf
in cmd_clo
n
e()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-25
M
iklos Vaj
n
a
builtin-cl
o
n
e
: use
s
t
r
b
uf in clone_loc
a
l() a
n
d cop
y
_or_l
i
nk
_
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-25
M
iklos Vaj
n
a
builtin-clone: use strbuf in gu
e
ss_dir_name()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-24
Miklo
s
V
ajna
Add
n
e
w t
e
stcase
t
o
show fast-export does not alw
a
ys
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-18
M
iklos Vaj
n
a
builtin-branch
:
use
strbuf
i
n rena
m
e_branch()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-18
Mikl
o
s Vajna
b
u
iltin-branch: use
strbu
f
in
f
ill_track
i
ng_i
n
fo(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
os Vajna
b
u
ilt
i
n-branch:
use strbuf in
del
e
t
e
_
b
r
anches()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
os
Vajna
Update Hu
n
garian translatio
n
.
100% com
p
let
e
d
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Va
j
na
git-remote: d
o
cument
t
he m
i
gration
feature of t
h
e
rename
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-12
M
i
klos Vajna
git-remote
r
e
name: migrat
e
from remot
e
s/
a
nd
br
a
n
c
he
s
/
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-11
Mi
k
lo
s
V
ajna
remote: add a n
e
w 'origin
'
variable to the str
u
ct
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-05
M
iklos V
a
jna
Imple
m
ent git re
m
o
t
e rename
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-01
Mi
k
los Vajna
updat
e
-re
f
--no-
d
eref -d: han
d
le
the
c
a
s
e w
h
en the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-30
Mik
l
os Vajna
g
i
t
bra
n
ch
-
m: f
o
rbid renaming of a
symref
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
Vajna
F
i
x git
u
pdate-ref --no-deref -d
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
rename_ref(): handle the
c
ase when the reflog of a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
Vajna
Fix git branch -m for symrefs
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
par
s
e-opt: migrate bui
l
tin
-
chec
k
out-in
d
ex
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add
t
es
t
case to ens
u
re merging an ear
l
y part of a branch
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
Mik
l
o
s Vajna
Add Linux P
P
C support to the pr
e
-auto-gc
exa
m
ple ho
o
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-10
M
i
klo
s
V
a
jna
t
e
st-lib: fix color reset
i
n sa
y
_colo
r
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
M
i
k
los Vajna
I
m
plem
e
nt git c
l
one -v
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Cleanup in sha1_file
.
c::cache_or_unpack_e
n
try()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-commit
:
u
se
r
educe_heads() only whe
n
appropriate
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-
m
erge: refr
e
sh
t
he ind
e
x b
e
fo
r
e calli
n
g a st
r
ate
g
y
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
V
aj
n
a
t7603
:
ad
d
ne
w
testc
a
ses
t
o ensure builtin-commit uses
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
builti
n
-co
m
mit: use
commit
_
tree()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
c
ommit_tree(): add a ne
w
author parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos Vajna
t7501: always use test_cmp i
n
stead of
diff
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Va
j
n
a
builtin-merge: release the lockfile in tr
y
_
m
erge_strategy()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vaj
n
a
m
erge-rec
u
rs
i
ve: ge
t
rid of virtual
_
id
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajn
a
merge-re
c
ursiv
e
: move curr
e
nt_{fi
l
e
,d
i
rectory
}
_
s
et
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
M
i
k
los Vaj
n
a
merge-recursive: m
o
ve the globa
l
ob
u
f to struct
m
erge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merg
e
-
r
e
c
ursive: get rid
of the i
n
dex_only global variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
Miklos V
a
jna
m
e
rge
-
recursive
:
move ca
l
l_depth to stru
c
t merge_opt
i
ons
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
M
i
klos V
a
jna
M
ak
e
file: ad
d
merge
_
recurs
i
ve
.
h
to LIB_
H
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
M
iklos Vajna
c
h
erry-pic
k
/
re
v
ert: make direct
i
nterna
l
c
all to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
M
i
klos Vajna
bu
i
l
tin-merge: avoid run_
c
o
m
mand_
v
_opt()
for re
c
u
r
si
v
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
merge-recurs
i
ve: introduce
m
erge_o
p
tio
n
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
M
ikl
o
s Va
j
na
S
p
l
it
o
ut merge_recursive
(
) to m
e
rge-recursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
M
ik
l
os Va
j
na
M
a
kefile: enable S
N
P
RI
N
TF_RETURN
S
_
B
OGUS for HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Mik
l
os Va
j
na
F
i
x 'git he
l
p help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos
V
a
j
na
t9300: replace '!' with test_must_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documentation
:
d
ocument
the pager
.
* configura
t
ion se
t
ting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos V
a
jna
B
uiltin
g
it-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vaj
n
a
builtin
-
hel
p
: alwa
y
s load_com
m
and
_
list() in cmd_h
e
lp()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vaj
n
a
Add
a s
e
cond testcase for han
d
ling invalid strategies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos V
a
jn
a
Add a
n
ew
test
f
or
u
sing a c
u
stom merge strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
bu
i
ltin-mer
g
e: allow using a custom strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Vajna
bu
i
l
tin-help: make s
o
me i
n
t
ernal functi
o
n
s available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Va
j
na
t760
1
:
extend the 'mer
g
e picks up the best re
s
ult'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Mikl
o
s Vajna
built
i
n-me
r
ge:
gi
v
e a proper
e
rr
o
r message for
i
nvalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach 'git merge'
t
h
at some merge strategies no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
A
d
d a new test for
g
it-me
r
ge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: a
d
d a n
e
w
test
for git-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make
r
emov
e
-d
a
shes: apply to sc
r
i
pts and p
r
ograms as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vajna
git-b
i
sect: use dash-less form on g
i
t bise
c
t log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-hash-object
.
sh:
u
s
e
quotes
for the
t
est descript
i
on
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s
Vajna
t0001-init
.
sh: change confusing dir
e
cto
r
y n
a
me
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Mik
l
os Vajna
B
uild in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos V
a
jna
Fix t7601-merge
-
p
ull-config
.
sh on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos Vajn
a
git-commit-tr
e
e: make i
t
usa
b
le fr
o
m
other bu
i
ltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
A
dd ne
w
test cas
e
to ensure git-merge prepends
t
h
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g-to-git: use git init ins
t
e
a
d of g
i
t init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
jna
hg-to-git: rew
r
ite "gi
t
-frotz" to "git frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vaj
n
a
hg-to-git
:
abo
r
t if th
e
p
rojec
t
directory is not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git
:
avoid raising a
s
t
ri
n
g
exception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
los Vajn
a
INSTALL:
U
pdate section about g
i
t-frotz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
M
i
k
los Vajna
R
etire 'stupid' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
A
d
d new
t
es
t
case to e
n
sure git-m
e
rge reduces
octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
d
d new test to ensure
git-merge handl
e
s more
t
han
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
I
ntroduce get_oc
t
o
p
us
_
merge_bases
(
) in
commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
g
i
t-fmt-merge-msg: mak
e
it us
a
ble from other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Move read_
c
ache_unmerged() to r
e
ad-c
a
che
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Add
n
ew tes
t
t
o
en
s
ure
g
it-m
e
rge handles p
u
l
l
.
t
w
ohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos V
a
jna
Mov
e
p
a
rse-optio
n
s's skip_prefix() to
git-compat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Va
j
na
Move commit_lis
t
_count() to commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vaj
n
a
Mo
v
e split
_
cmdline()
t
o ali
a
s
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
pa
t
h-
l
ist docum
e
ntation: docu
m
ent all funct
i
ons a
n
d
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Mi
k
los
Vajna
run-command documentation: fix "memset(
)
" par
a
met
e
r
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
M
ikl
o
s Vajna
git-read-tree:
d
ocument -v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los Vajna
A simple scrip
t
to parse
t
he
r
e
s
ults f
r
om the testcas
e
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
git-rebase -i: mention the
s
hort
command
aliases in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remove
u
n
used
c
ode in par
s
e_com
m
it_
b
uffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos V
a
j
na
Strb
u
f
d
ocumenta
t
ion: document most functions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
R
evi
s
i
on wa
l
king do
c
um
e
ntation: document mo
s
t important
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
Co
d
in
g
Guideline
s
: Add a note to avoid assignments ins
i
de
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git-merge: exc
l
u
d
e unnecessar
y
options from OPTIONS_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
git-fast-impo
r
t: re
n
ame c
m
d
_*() functions to parse_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Mikl
o
s
V
ajna
INSTALL: add
a note about G
N
U interactive t
o
ols
h
as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
o
s Vajna
Add tes
t
s for sendemail
.
cc configu
r
ation
v
ariable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
next