repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
cherry-pick/revert: add support for -X/--strategy-option
2010-08-20
Jonathan Nied
e
r
Do
c
u
m
entati
o
n
:
unbreak regex in sho
w
-
r
ef
m
a
n
ual
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jo
n
athan Nieder
Documentation: quoting tro
u
ble i
n
"git rm
"
discussion
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan
Nied
e
r
Documentation: tweak descript
i
on
o
f log
.
date
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonath
a
n Nieder
D
o
c
umentation
:
s
e
t
a !DOCTYPE for user manual
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-19
Jon
a
tha
n
Nieder
autoconf: don't u
s
e platform regex
if it lacks REG_STARTEND
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
a
t
h
a
n
N
ieder
mer
g
e scri
p
t: learn --[no-]rerere-au
t
oupdate
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
merge s
c
r
ipt: n
o
ti
c
e @{-
1
}
s
ho
r
thand
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
at
h
an Ni
e
der
me
r
ge script
:
h
a
nd
l
e --no-ff
--no-commit co
r
rectly
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
merge script: --ff-only
t
o disallow true merge
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nie
d
er
merge scrip
t
:
h
andle
many-way oc
t
opu
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan N
i
eder
merge
script: han
d
le -m --log correctly
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: forbid
m
erge -
s
index
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
mer
g
e script: allow custom strategies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
on
a
than Ni
e
der
merge script:
m
erge -X<option>
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: imp
r
ove
l
o
g
message sub
j
ect
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Ni
e
der
merge
scr
i
pt:
r
efuse t
o
merge during mer
g
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
merge script: twe
a
k
unmerged fi
l
es m
e
ssage to
match
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
m
erge script:
-
-sq
u
ash, --ff from un
b
orn branch are
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
fmt-merge-msg -m to override mer
g
e
t
i
tl
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
merg
e
-base --indepe
n
dent to
pri
n
t reduced parent list
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nath
a
n Ni
e
der
m
e
rge
-
base --octo
p
u
s to mimic show-branch --me
r
g
e
-base
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
D
ocume
n
t
a
tio
n
: a
d
d a SEE ALSO
section for merge-base
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
t
6
200 (
f
mt-me
r
ge-m
s
g): style ni
t
p
icks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
t601
0
(merg
e
-
base):
m
odernize style
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
h
an Nied
e
r
t76
0
0 (merge
)
: test
m
erge from branc
h
yet
t
o
b
e
b
o
rn
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than
Nieder
t76
0
0
(
merge):
check re
f
log entry
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
athan Ni
e
der
t
7
600 (merge): do n
o
t l
a
unch gitk
for
-
-debug
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
t
7
600 (mer
g
e): modernize style
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
merge: d
o
not mi
s
t
a
k
e
(ancestor
of) tag for branch
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-16
J
onathan Nieder
t7006 (pag
e
r
)
:
add missing TT
Y
pr
e
r
e
q
u
i
sites
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jonat
h
an Nieder
m
erge: let custom
strategies intervene in tri
v
ial
merges
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Nieder
t76
0
6 (m
e
rge-theirs): moder
n
iz
e
s
tyle
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jon
a
than Nieder
che
r
ry-pick/rev
e
r
t
:
Use
a
dvise() for hints
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Nieder
cherry-pi
c
k/revert: Use error() for failur
e
message
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Nieder
Introduce advise() to
print hi
n
ts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jon
a
than Nie
d
er
E
l
iminate “
F
inish
e
d cherry-
p
i
c
k/revert” m
e
s
s
age
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
t9010 (svn-fe): avoid s
y
mlinks in tes
t
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
t9010 (svn-fe): use Unix-style pa
t
h in URI
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
v
cs-svn: Avoid %
z
in format string
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nie
d
er
vcs-svn:
Rename dirent pool to bu
i
l
d on
Wi
n
dows
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-15
J
onatha
n
Nieder
com
p
at:
add strtok_r()
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jona
t
ha
n
N
i
eder
treap:
s
t
y
l
e fix
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-15
J
onathan Nie
d
er
v
c
s-svn: remove build artifacts on "m
a
k
e
c
lean"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-15
J
on
a
than Nieder
svn-fe man
u
al:
C
l
arify warning about de
l
tas in dump
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan
Nieder
Update svn-fe manual
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-15
J
o
n
a
tha
n
N
i
eder
Intr
o
d
uce vcs-s
v
n lib
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-12
Jonathan
Nied
e
r
Standardize do {
.
.
.
} w
h
i
l
e
(
0) st
y
le
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-11
Jo
n
athan Nieder
write-tree:
A
v
oid leak
w
he
n
index refers to
an invalid
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-11
J
o
nathan Nieder
read-tree: sto
p
leaking tree
object
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-11
J
onatha
n
N
i
eder
core: Stop
l
eaking ondisk_cache_entrys
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jonath
a
n Nieder
g
itweb: clarify
search
resu
l
ts page when no
m
atch
i
n
g
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan N
i
eder
D
ocu
m
entation: ad
d
a FI
L
ES secti
o
n
for sh
o
w
-
ref
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jon
a
than
N
i
eder
Make
f
i
le: add
mi
s
sing d
e
pen
d
ency on
ht
t
p
.
h
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-09
J
o
n
a
than
N
ieder
M
akefile: add
m
issing
de
p
endencies on url
.
h
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonath
a
n Nieder
A
l
l
ow "check
-
ref-for
m
a
t --bra
n
ch"
from subdirectory
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
o
na
t
han Ni
e
der
c
h
e
ck
-
r
e
f-for
m
at: ha
n
dle subcommands
in s
e
parate f
u
nctions
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
N
ieder
mer
g
e-re
c
ursiv
e
--re
n
o
r
malize
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
rerere: never r
e
normalize
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
rere
r
e: mig
r
ate to parse-op
t
ions API
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
t42
0
0 (rere
r
e): modernize style
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonat
h
an Nieder
ll-me
r
ge: let caller decide
w
heth
e
r to renormalize
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
l
l-
m
erge: make f
l
ag e
a
sier
to po
p
ulate
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
N
ieder
Documentation/techni
c
al: document ll_merge
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Ni
e
der
mer
g
e-trees: let caller dec
i
d
e
whether to re
n
ormalize
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
merge-trees: push choice
t
o
renormal
i
ze a
w
ay from
l
ow
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
N
ieder
t6038
(
merge
.
re
n
ormalize): che
c
k that it can be turn
e
d of
f
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
ath
a
n Nieder
t60
3
8 (mer
g
e
.
renor
m
alize
)
:
try che
c
k
ou
t
-m and cherry
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jon
a
t
h
an
Nieder
t6038
(merge
.
r
e
normalize)
:
styl
e
nitpic
k
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
N
ied
e
r
di
f
f: s
p
lit off a fun
c
t
i
on for --stat
-
* opti
o
n
p
a
r
sing
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-04
Jonathan N
i
e
d
er
t
4
111 (apply):
r
e
f
r
e
sh index befo
r
e applyi
n
g patches
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-02
Jonathan Ni
e
d
e
r
Do
c
u
m
enta
t
ion: fle
s
h out “
g
it pull”
d
e
s
cription
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-02
Jo
n
athan Nieder
gitweb: all
o
w configurat
i
on
s
that change
with each
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-02
J
onathan Nieder
t
101
1
(sp
a
rs
e
checkout): style nitpicks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jo
n
athan Nie
d
er
examples/commit
:
use --abbrev for commit
s
u
m
m
ary
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
checkout
,
comm
i
t: remove
conf
u
sing assignments to rev
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jonatha
n
Nieder
a
rchive: abb
r
e
viate sub
s
ti
t
uted commit ids a
g
ain
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-27
J
o
nathan Nieder
config --get
--path
:
check for u
n
se
t
$HOME
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan
N
i
e
der
s
e
t
u
p: sp
l
i
t
off get_de
v
ice_or
_
die helper
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jonat
h
an N
i
e
der
setu
p
:
s
plit off
a fun
c
tion to
ha
n
d
l
e
hitti
n
g c
e
iling
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-26
J
o
nath
a
n Nieder
setup: split of
f
code to handle stumbling upon a repository
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jonatha
n
Nieder
setup: split off a function to c
h
e
cks w
o
rking dir f
o
r
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
set
u
p:
split off $G
I
T_D
I
R-
s
et c
a
se fr
o
m
setup_git_dire
c
tor
y
_
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jonatha
n
Nieder
tests: t
r
y git
apply from subdir of toplevel
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jonat
h
an
N
i
eder
t1501 (rev-parse):
clarif
y
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan Nieder
t340
0
(rebase): wh
i
t
espace cle
a
nup
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-23
Jo
n
athan N
i
eder
t4
1
50 (
a
m): futur
e
pro
o
f
against
failing
tes
t
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-23
Jonat
h
an Nieder
t
4150 (am): style
f
ix
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan N
i
eder
t/README: correct an
e
x
c
ep
t
ion when br
e
a
k
i
ng a &&
c
hain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jonat
h
an Nieder
Add
a
samp
l
e user
f
o
r the svndum
p
library
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nied
e
r
E
x
p
ort
p
a
rse_date_bas
i
c() t
o
co
n
v
ert a date st
r
i
n
g
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
D
o
c
u
mentation:
a
dd submodul
e
.
*
to th
e
big
c
onfiguration
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jo
n
a
t
han Nieder
gitmodules
.
5: u
r
l can be a relative path
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonath
a
n
Niede
r
git --paginate:
pagina
t
e ex
t
ernal comma
n
ds again
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-12
J
o
nathan N
i
eder
t
3
000 (ls-files -o)
:
mod
e
rnize styl
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-08
Jonathan
N
ieder
t9118 (git-svn):
preve
n
t early fa
i
lure from tak
i
n
g
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan Nieder
t/README: doc
u
ment mo
r
e test helper
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-05
Jonat
h
an Nieder
Teach fast
-
import to import s
u
btrees nam
e
d by tree
i
d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-29
Jonathan Nieder
re
v
ert: do
n
ot rebu
i
ld arg
v
on heap
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
J
on
a
than Nieder
test
s
:
l
ocal
co
n
fig file should b
e
honored from subdirs
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonat
h
a
n Nieder
t7006:
test page
r
configuration
for several g
i
t commands
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
next