repo.or.cz
/
tgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/maint-ls-files-other' into maint
2008-10-14
M
i
k
los Vajna
Ad
d
testcase
t
o
e
ns
u
r
e
m
e
rging an e
a
rly part of a bra
n
ch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajna
test-lib
:
fix
c
o
lor reset in say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Vajna
t7501:
always use
test_cmp instead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mik
l
os Vajn
a
Makefile: add merg
e
_r
e
cu
r
s
i
ve
.
h
to L
I
B_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
M
ik
l
os V
a
jna
M
akefile: enable SNPRINT
F
_
R
ETURNS
_
BOGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos V
a
jna
Fix 'git
h
elp
hel
p
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
i
k
los Vajna
t9
3
00
:
repl
a
ce '!' wit
h
test_must_f
a
il
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documentation: doc
u
m
e
nt the pager
.
* c
o
nfiguration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mik
l
os Vajna
t7601:
extend t
h
e 'me
r
ge picks
up the
b
est result
'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos
Vajna
builtin-merge: give a prope
r
error message for inva
l
id
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mikl
o
s
Vajna
Teach 'git merge'
th
a
t som
e
merge strategies n
o
longe
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mikl
o
s Va
j
na
Add a
n
ew test
for git-merge-re
s
olve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021:
add a n
e
w test
f
or git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vaj
n
a
make remove-dash
e
s
: app
l
y to scrip
t
s
and programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajna
git
-
bisect: use dash-l
e
ss
form
o
n g
i
t bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t
1
007-hash-object
.
sh: use quotes
f
or the test d
e
scription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t000
1
-i
n
i
t
.
sh: c
h
ange c
o
nfu
s
ing directory
n
am
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajn
a
B
u
ild in m
e
rg
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix t7601
-
merge-pull-config
.
sh
o
n AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
iklo
s
Vajn
a
git-comm
i
t
-
t
r
ee: make
i
t
usable f
r
om ot
h
er b
u
il
t
i
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
ajn
a
Add new test case to ensure
git-merge p
r
epends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-gi
t
: use
g
it
init in
s
tead of git ini
t
-
db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
h
g
-to-git: rewrite "g
i
t
-
f
rotz"
t
o "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-gi
t
: ab
o
rt
i
f the
pr
o
ject directory
i
s not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-g
i
t: avoid raisi
n
g a string
exce
p
ti
o
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
n
a
I
NSTA
L
L: Update section about git-frotz fo
r
m
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklo
s
Vajna
Reti
r
e
's
t
upid' merge stra
t
egy
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajn
a
Ad
d
new test case to ensur
e
gi
t
-
merg
e
red
u
ces octopu
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
kl
o
s
V
ajna
Add new test to
e
nsure g
i
t-merge
handles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Introdu
c
e get_oct
o
pus_merg
e
_bases(
)
in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
git-fmt-merge-msg: make it
u
s
a
ble fro
m
ot
h
er builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move read_cac
h
e_unmerged() to
r
e
ad-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
lo
s
Vajna
Add
new test
t
o ensure g
i
t-
m
erge hand
l
e
s
p
u
ll
.
twoh
e
a
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajn
a
Mo
v
e parse-o
p
t
i
o
n
s's skip_
p
refix() t
o
g
i
t
-com
p
at-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Move commit_lis
t
_count() to co
m
mit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Move split
_
c
m
d
line(
)
to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
path-list docum
e
n
tation:
d
ocu
m
ent all f
u
ncti
o
ns and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mikl
o
s Vaj
n
a
r
un
-
command documentatio
n
: fix "mems
e
t()" para
m
et
e
r
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos
V
ajna
gi
t
-rea
d
-
tree: document
-
v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
Vaj
n
a
A
simple script to
p
arse the results from the t
e
stcase
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos Vajna
git-rebase -i:
m
ention the
s
hort command alia
s
es
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
k
l
os Vajn
a
Remo
v
e unused code in parse_com
m
it_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
M
i
k
los Vaj
n
a
S
t
rbu
f
documentation: d
o
cument most functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
i
k
l
o
s Vajn
a
Rev
i
sion w
a
lki
n
g do
c
u
m
entation: document mo
s
t important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
C
o
dingGuid
e
li
n
e
s
:
Add a note to
avoid
assignments
i
nside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git-m
e
rge
:
exclud
e
unnec
e
ssary
options from OPTIONS
_
SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos V
a
jna
g
i
t-fast-import: rename
cmd_*() functions to parse_
*
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTALL: ad
d
a note abo
u
t GNU
i
nteractive tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Vajna
A
dd te
s
t
s for
s
endemail
.
cc co
n
figu
r
a
tion var
i
a
ble
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
iklo
s
Vajna
git-
s
e
n
d-email: ad
d
a n
e
w sendemail
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vaj
n
a
g
it-fo
r
m
a
t
-
patch: add a n
e
w format
.
cc con
f
igura
t
io
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
M
i
k
los Vajna
g
it
c
heckou
t
:
a
dd -t alias for
-
-
tra
c
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Va
j
n
a
diff
opti
o
ns d
o
cumen
t
ation: refer t
o
--
d
iff
-
filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos Vajna
contri
b
/hooks: add an example pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
V
a
jna
Docume
n
tati
o
n/
h
ooks: a
d
d
p
re-au
t
o
-
gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos V
a
jn
a
git-gc --auto: add pre-
a
uto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Documentation/
g
it-merge: d
o
cument subtree s
t
rategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Mikl
o
s Vajna
git-gui: Updat
e
d Hungarian translation (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos V
a
jna
U
p
date Hung
a
rian transl
a
tion
.
100% comp
l
eted
.
commit
|
commitdiff
|
tree
2008-02-29
M
i
klos Vajna
Improve t6029 t
o
c
h
eck t
h
e rea
l
"subt
r
e
e"
case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Mi
k
los Vajna
D
o
cumentatio
n
/
g
i
t
svn log: add a note abou
t
t
i
mezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Va
j
na
Documenta
t
ion/
g
it-filter-branch
:
add a
ne
w
m
s
g-filte
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklo
s
Vajna
git-clea
n
: handle erro
r
s if r
e
m
o
ving files
f
ails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Mikl
o
s Vajna
Documenta
t
ion
/
g
i
t-st
a
sh: docu
m
ent
opti
o
ns for g
i
t
s
tas
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
M
i
k
l
o
s Vajna
g
it clo
n
e -s documentation: force a new paragra
p
h
f
o
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Mi
k
los Vajna
builtin-
g
c
.
c: guard c
o
nfig parser from
v
alue=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git rev-
p
arse manpag
e
: spelling
f
i
x
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Mi
k
los Vajna
git pull ma
n
p
a
ge
:
d
on't
i
n
clude
-
n fr
o
m f
e
tch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklo
s
V
a
jna
git
-
clone -s: docum
e
nt pr
o
blems with git
g
c --prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Mik
l
os Vajna
I
n
clud
e
rev-lis
t
options in
git-log
manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Mik
l
os Vajna
ls-remote: add -t and -h optio
n
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklo
s
Vajna
A
d
d using merge subtree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos
V
a
j
na
t/t7001: av
o
id
unnecessary ERE when using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vaj
n
a
g
i
t-
s
h-setup: docume
n
t git_editor(
)
and
g
et_author_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
ever
y
day: replace '
p
rune' and 'repack' with 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mik
l
os Vajna
Update Hungarian translation
.
100% comple
t
ed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
V
ajna
I
n
clude d
i
f
f options in t
h
e git-log ma
n
page
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
M
iklos Vajna
g
it-send-email: add a new sendemail
.
to configurati
o
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Mi
k
l
o
s Vajna
git
stash: document app
l
y's --inde
x
switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos V
a
jna
git-bundle: fix command
l
ine example
s
i
n
t
h
e
m
a
npage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos
V
ajna
User
Manual: add a ch
a
p
t
e
r
for su
b
modules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Mik
l
os Vajna
Hun
g
aria
n
translation of git-
g
ui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vajna
gi
t
w
e
b: new
cgi par
a
meter
:
opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
gitweb: prefe
r
git_get_
p
roject_owner() o
v
er get_file_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Mik
l
os Vajna
Doc
u
ment
-<n>
f
o
r
git-form
a
t-pat
c
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree