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 Linux PPC support to the pre-auto-gc example hook
2008-10-14
Miklo
s
V
a
j
n
a
Ad
d
Linux PPC
s
upport to t
h
e
p
r
e
-
auto-gc ex
a
mple ho
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajna
test-lib
:
f
ix color re
s
et in say
_
c
o
lo
r
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Va
j
na
Cleanup
in sha1_f
i
le
.
c::cac
h
e_o
r
_unpack_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vaj
n
a
builtin-merge: refresh the index before calling a
s
trategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t760
3
: add new testcases to
ens
u
re buil
t
in-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
bu
i
ltin-com
m
it: use commit_tr
e
e()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
c
o
m
m
it_tr
e
e(): add a n
e
w
a
u
thor parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t
7
5
01
:
always us
e
test_cmp instea
d
of d
i
f
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
M
iklos Vajn
a
bu
i
ltin
-
me
r
g
e
: relea
s
e
t
he
lockfile in try_
m
erge_
s
tr
a
tegy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos Vajna
merg
e
-recursiv
e
: get rid of
v
irtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge
-
recursi
v
e: mov
e
current_{f
i
le,
d
irectory}_
s
et
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos Vajna
m
e
rge-recursive: move the gl
o
bal obu
f
to struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
erge-
r
e
cursive: get
r
id of the inde
x
_o
n
l
y global variabl
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
M
i
klos Vajna
merge-
r
ecursi
v
e: move call
_
depth to struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos
V
ajna
Makef
i
le:
ad
d
mer
g
e_recursive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklo
s
V
a
jna
c
h
erry-pick/
r
evert:
make
d
irect internal
c
all to merge_tr
e
e
(
)
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
b
uilti
n
-
m
erge: avoi
d
run_command_v_opt() for r
e
curs
i
v
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
i
klos Vajna
merge-recu
r
sive: introduce mer
g
e_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
V
ajna
Split out merge_recursive() to mer
g
e-
r
ecur
s
ive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
M
iklos
Vajn
a
Makefile:
e
n
a
b
le SNP
R
INTF_RETU
R
NS_BOG
U
S for HP
-
UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix 'git
h
el
p
h
e
lp'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Mik
l
os Vajna
t930
0
: replace '!'
w
i
t
h tes
t
_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mik
l
os Vajna
Documentation:
d
ocumen
t
the
pa
g
er
.
*
configuration
sett
i
ng
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklo
s
Vajna
Builtin
g
it-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vaj
n
a
bui
l
tin-help: a
l
ways load_command_list() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
na
Add a seco
n
d testcase for h
a
ndling invalid
s
trategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a n
e
w tes
t
for
using a custom
merge str
a
tegy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
na
builtin-
m
erge:
allow using a cus
t
om
s
t
rat
e
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
Vajna
builtin-help: make s
o
me internal functions availa
b
le
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601: extend
t
he
'
m
e
rge pic
k
s up the
best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos
V
ajna
bui
l
tin-merge: g
i
ve
a proper error message for
i
nvalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
M
iklos Vajna
Tea
c
h 'git merge' that some merge stra
t
egies no lon
g
er
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Va
j
na
A
d
d
a
new t
e
st for git-
m
erge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: a
d
d a new test
f
or git-
m
erg
e
-r
e
solve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
make remove-d
a
shes:
apply to scrip
t
s and programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisect: use dash
-
less for
m
on git bisect
l
og
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Va
j
na
t1007-has
h
-
o
bject
.
s
h
:
use q
u
otes for
the test desc
r
iption
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t
0
001-init
.
sh: change confusing directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
i
klo
s
Vajna
Build in
m
e
r
ge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajna
Fix
t7601-
m
erge-pu
l
l-config
.
s
h on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos Vajna
git-commit-tree: make it usable from other builtin
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
ajna
Add new test case to ensure git-merg
e
p
r
ep
e
nds the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-t
o
-gi
t
: use git init instead of git i
n
it-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajna
hg-to-git: rewrite "git-frot
z
" to "git fro
t
z"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
j
n
a
hg-to-git: abort if
t
he projec
t
directory is n
o
t
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
hg-to-
g
it: avoid rai
s
ing a string exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
INSTALL: Upd
a
te section about g
i
t-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklo
s
Vajn
a
Retire 'stupid' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Va
j
na
Add new te
s
t
case to ensure git-mer
g
e
r
educes octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Add
new test to ensure git-merge handles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Intr
o
duce get_octo
p
u
s
_m
e
r
g
e_
b
ases() in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
lo
s
Vajna
git-fmt
-
merge-msg:
make
it us
a
ble
from oth
e
r
b
ui
l
tins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move read_cache
_
unmerge
d
(
)
to r
e
ad-c
a
che
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jn
a
Add
new test t
o
ensu
r
e git-me
r
ge
h
an
d
l
es pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
l
os Vajn
a
M
ov
e
parse-options
'
s skip_prefix() t
o
git-c
o
m
p
at-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Move commit_l
i
st_count
(
) to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mo
v
e spli
t
_cmdlin
e
() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
V
a
j
n
a
pa
t
h-list
documentation: document all functions
a
nd
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos V
a
jna
run
-
command documentati
o
n
: fix
"m
e
mset()" para
m
eter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-
r
ead-tree:
document -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklo
s
Va
j
na
A simple script to parse the re
s
u
l
ts fro
m
the
t
estc
a
se
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vaj
n
a
g
it-
r
e
b
a
s
e
-i: mention the short command a
l
iases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Va
j
n
a
Remov
e
u
nused co
d
e
in parse_commit_buffer
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Va
j
n
a
Strbu
f
documentation: document mo
s
t
functio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
ik
l
os V
a
jna
Revision walkin
g
do
c
um
e
n
tat
i
on: document most impor
t
ant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mikl
o
s V
a
j
na
C
odi
n
gGuidelines:
A
d
d a note to
a
voi
d
assignm
e
nts
insid
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Mik
l
o
s
V
ajna
git-merge: exclud
e
unn
e
ce
s
sa
r
y opt
i
ons from OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Va
j
na
git-fast-import: re
n
ame cmd_*() functions to parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos
V
a
j
n
a
INSTALL: add a no
t
e
a
bout GNU
i
nteract
i
ve tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Vajna
A
dd tests for sendemail
.
cc configu
r
ation
v
ar
i
able
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vaj
n
a
g
i
t
-send-e
m
ail: a
d
d a ne
w
se
n
demail
.
cc configurat
i
o
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
Va
j
na
g
i
t-format-patch: add a new fo
r
mat
.
cc config
u
ration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git chec
k
out
:
ad
d
-t alias
f
or --track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
diff options d
o
cumentat
i
on: r
e
fer to --diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
contrib/
h
ooks: add an example pr
e
-aut
o
-gc
h
ook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
Vaj
n
a
Document
a
t
ion/hooks: ad
d
pre-au
t
o-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
git-gc --auto: add
p
r
e
-auto-gc hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Mikl
o
s Vajn
a
Documentation/git-merge:
d
o
c
um
e
nt sub
t
ree str
a
tegy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
gi
t
-gui
:
Upda
t
e
d Hungari
a
n translation (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Update Hung
a
ri
a
n translation
.
100%
c
ompleted
.
commit
|
commitdiff
|
tree
2008-02-29
Mi
k
lo
s
Vajna
Improve t6029 to check the real "su
b
tree"
case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklo
s
Vajna
Documentation/git svn log:
add
a
n
o
te about t
i
m
ezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos
Vajna
Documentation/
g
i
t
-
f
il
t
er-branch: add a
new
msg
-
f
i
lter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-clea
n
: handl
e
errors if r
e
movi
n
g files
fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos
V
aj
n
a
D
ocumentatio
n
/git-stash: document optio
n
s
f
or git
s
tash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos
V
ajna
gi
t
cl
o
ne -s documentation: force a new paragraph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
M
iklos Vajna
builtin-gc
.
c: gu
a
r
d config pa
r
s
e
r fro
m
valu
e
=N
U
LL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
M
i
kl
o
s
Vajna
g
it rev
-
parse manpage: s
p
elling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Mi
k
los Vajna
git pull manpage:
d
on't include -n from fetch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
M
i
kl
o
s Vaj
n
a
g
it-clon
e
-
s
: document probl
e
ms w
i
th git gc
--prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
M
i
klos
Vajna
I
n
c
lude re
v
-list
opti
o
ns in git-log
m
a
n
page
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls-
r
e
m
ote
:
a
dd -t and -h
op
t
ions
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Mikl
o
s
Vajna
Add u
s
i
n
g
m
e
r
g
e
s
ubtree
How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Mikl
o
s Vajna
t/t7001
:
av
o
id un
n
ecessary ERE when us
i
ng gr
e
p
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklo
s
Vajna
git-s
h
-setup: documen
t
g
it_edi
t
o
r() an
d
get_author_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
eve
r
yday: replace 'prune' an
d
'repack
'
with 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update Hungari
a
n translation
.
100% complete
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Include diff
options in the git-
l
og manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
M
ikl
o
s Vajna
g
i
t-se
n
d-email: add a n
e
w sendemail
.
to configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Mi
k
los Vajna
git st
a
sh: documen
t
a
pp
l
y'
s
--index
s
witch
commit
|
commitdiff
|
tree
next