repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge script: learn --[no-]rerere-autoupdate
2010-08-18
Jon
a
than Nieder
mer
g
e script: le
a
rn
-
-[no
-
]rerere-autou
p
da
t
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
m
e
r
g
e script
:
notice @{-1} s
h
or
t
hand
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nied
e
r
m
e
rge scrip
t
: handle --no-ff --no-commi
t
co
r
rectly
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
at
h
an N
i
eder
merge s
c
ript: -
-
ff-onl
y
to disallow true me
r
ge
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
merge
s
c
r
ipt: ha
n
dle many-way octop
u
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
merge script: ha
n
dle -m --lo
g
corre
c
tl
y
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
me
r
ge script: forbid me
r
ge -s in
d
ex
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
h
an Nieder
m
erge
s
c
ript: allow custom strate
g
ies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
mer
g
e script: merge
-X<option>
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nied
e
r
merge
script: improve log messag
e
s
ubject
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
N
ieder
merge
s
cript: refu
s
e to merge during merge
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
erge script: tweak
u
nmerged
f
iles message to match
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
a
n
Nieder
merg
e
s
c
r
ipt: --squa
s
h, --ff from unb
o
rn branc
h
are
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
N
i
eder
fmt-merge-msg -m
t
o overri
d
e merge ti
t
le
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge
-
base --
i
ndependent to p
r
int reduc
e
d
parent l
i
st
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nie
d
er
m
erge-base -
-
octopus
t
o mimic
s
how-bra
n
ch --merg
e
-base
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
Documentation: add a SEE ALSO section for m
e
rge-base
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
N
i
eder
t62
0
0 (
f
mt-merge-
m
s
g): styl
e
nitpicks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
t
60
1
0
(
m
erge-base): mode
r
ni
z
e style
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
t7600 (merge
)
: t
e
st merge from branc
h
yet to be born
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
t7600
(
merge): check r
e
flog entry
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
i
e
der
t7600 (merge): do
not la
u
nch
gitk f
o
r --debug
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ie
d
er
t7600 (m
e
rge): modernize style
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge: do not mis
t
ake
(ancestor of) tag for b
r
anch
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonath
a
n
Nieder
t/README: c
o
rrect an
excep
t
ion whe
n
breaking
a && c
h
ain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jon
a
t
han Nieder
Add a sample us
e
r for the
svndump l
i
brary
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jo
n
athan Nieder
Documen
t
a
tion: add
submodule
.
*
t
o
the big co
n
f
iguration
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
gitmodule
s
.
5: url can be a relative pa
t
h
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Niede
r
git --pag
i
nate: paginat
e
e
xte
r
nal commands ag
a
i
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Nieder
t
3
000 (ls
-
fil
e
s -o): moderniz
e
style
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-08
Jonat
h
an Niede
r
t9118 (git-s
v
n): prevent early f
a
ilure
f
rom
taking
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan Nieder
t/README: do
c
ument more test helpers
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-29
Jonathan Nieder
reve
r
t: do not rebui
l
d argv on heap
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nieder
t
ests: local
c
on
f
ig file shou
l
d be honored from subdir
s
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
J
o
nath
a
n Nieder
t700
6
: test page
r
confi
g
uration for
several g
i
t command
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jo
n
atha
n
Nieder
t7006 (pa
g
e
r
): intro
d
uce helper fo
r
pa
r
a
meterized
t
e
s
t
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nieder
t3508
(ch
e
rry
-
pick):
f
uturep
r
oof against unmerged files
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jo
n
athan Nieder
git-
s
vn: strip o
f
f le
a
ding slashes o
n
--trunk ar
g
ument
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
Jonat
h
an
N
ieder
add-int
e
ractive:
C
l
arify “remaining hunks i
n
the file”
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Nied
e
r
g
r
ep: refact
o
r grep_objects loop into its own
f
unction
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Niede
r
D
o
cument
a
tion/
c
h
e
ckout: clarif
y
des
c
ri
p
tion
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
Jon
a
than Nie
d
er
rebase -i -p: docu
m
e
n
t shortcomings
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-02
J
o
nath
a
n Nie
d
e
r
DWI
M
'git show -5' t
o
'git sh
o
w
-
-do-walk -5'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jon
a
t
han Nieder
gitignore
.
5: Clarify
matching ru
l
es
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
rebase: improve error message wh
e
n ups
t
r
e
am a
r
g
ument
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
Docume
n
tation/checkout: cla
r
ify d
e
scription
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-28
Jonathan
N
ieder
fsck: fix
b
o
g
us
commit header check
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan N
i
e
d
er
Add git remote set-branches
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jonat
h
a
n Nieder
post-recei
v
e-email: d
o
cumen
t
command-line mode
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
onat
h
an Nied
e
r
g
i
t s
v
n
:
a
vo
i
d unini
t
ialized var in 'reset'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
M
a
kefile: le
t
header dependency checker override
C
OMPUT
E
_HEA
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonatha
n
Nieder
M
a
kefile: fix
header
dep
e
ndency che
c
ke
r
to allow
NO_CURL
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Nieder
Documen
t
ati
o
n/
n
otes
:
nitp
i
cks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Nieder
Docume
n
tation/notes: clean u
p
descript
i
on of rew
r
iting
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ied
e
r
Documentat
i
on/notes: si
m
plify treatment of
d
efaul
t
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan Nieder
Documentatio
n
/log: add a CONFIG
U
RATION sec
t
i
o
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan
N
i
eder
Documentation/notes: simplify
t
r
ea
t
ment of de
f
ault
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
o
n
a
than Nie
d
er
Do
c
umentation/no
t
e
s
: add configurati
o
n
s
e
ction
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han Nied
e
r
Do
c
u
ment
a
tion/n
o
te
s
: d
e
scribe conten
t
o
f
n
otes b
l
ob
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Niede
r
Documentation/notes
:
document f
o
rm
a
t of notes tr
e
e
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan
N
ieder
cherry-pick: d
o
not dump core when iconv fails
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nieder
pr
e
tty: initialize new cm
t
_
fmt_map to 0
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
J
onathan Nieder
adap
t
reque
s
t-p
u
ll tests for new p
u
ll request format
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-06
Jonathan Nieder
test-lib: som
e
s
hel
l
s d
o
not le
t
$? propagate in
t
o
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
s
h
ortl
o
g: Do
c
ument and test --format o
p
tion
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
J
o
n
athan Ni
e
der
t4201
(shor
t
log): Test outpu
t
fo
r
mat w
i
th multiple
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
han Niede
r
t4201 (shortlog): guard setup with t
e
st_exp
e
ct_success
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
than Nieder
Documentation/
s
hortlog: s
c
ripted users should not rel
y
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan
Nied
e
r
commit --amend: cop
e
with missin
g
displ
a
y name
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonath
a
n
Ni
e
der
t
est-lib:
Let t
e
st
s
specify com
m
a
n
d
s to
b
e run
a
t end
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Ni
e
der
fsc
k
: chec
k
ident lines in comm
i
t objects
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonat
h
an Ni
e
der
request-pull:
protect against OPTIONS_KEEPDASHDASH
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
t
es
t
s for request-pul
l
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-22
Jonathan Nieder
Document
a
tion/Makefile: fix interrupted b
u
il
d
s of us
e
r
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jo
n
a
tha
n
N
i
eder
fix "bundle --st
d
in" segfault
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
t570
4
(bun
d
le): add
tests
for bundle --st
d
i
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-17
J
o
nathan Ni
e
d
e
r
t
ag -v: use R
U
N_GIT_CMD to run verify-tag
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan
Nieder
Docu
m
ent
new "a
l
re
a
dy-merged" rul
e
for
b
r
a
nch -d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan N
i
eder
Add
.
dep
e
nd directories t
o
.
gitignore
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonath
a
n
N
i
ed
e
r
t7
0
06
:
g
uard
cleanup wi
t
h test_
e
xpect_success
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-13
J
ona
t
ha
n
Nieder
t
5
800: te
s
t
git helper requires Python support
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jona
t
h
an Nied
e
r
t7400: c
l
ar
i
fy subm
o
dul
e
upda
t
e tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
J
onathan Ni
e
der
t7400: clarify 's
u
bmodule add' t
e
sts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jona
t
han Niede
r
t7400:
s
plit setup int
o
m
ultiple t
e
sts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan Niede
r
Teach mailinfo %
<
as an altern
a
tive
scissors mar
k
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nieder
Makefile: fu
t
ure-proof Cygwin version check
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
merge-re
c
ursive: add a label for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
cherry-p
i
c
k,
r
e
vert
:
add a labe
l
for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
h
a
n Ni
e
der
r
evert: clarify label on conflict hunk
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Niede
r
c
omp
a
t
:
add
m
em
p
c
py(
)
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
c
hec
k
o
u
t -m --conflic
t
=diff3: a
d
d a
l
abel
for ancest
o
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
na
t
han Nieder
m
e
rge_trees(): add
a
n
cestor
l
abel parame
t
er
f
or dif
f
3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
m
erg
e
_
f
ile(): add comment explaining behavior wr
t
conflict
.
.
.
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an
N
ieder
c
h
eckout --c
o
nf
l
ict=diff3: add a la
b
el for an
c
estor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
ll_merge()
:
add ances
t
or
labe
l
parameter
fo
r
diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han
N
ieder
merge-file --diff3:
ad
d
a label for ancest
o
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Niede
r
xdl_merge(): mo
v
e
f
ile1 and fil
e
2
labels to xmpar
a
m
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nie
d
er
xdl_merge(
)
: add option
a
l anc
e
stor label
t
o diff3-sty
l
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
h
an Nieder
tests: docu
m
ent
cherry-pic
k
behavio
r
in face of conflict
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onatha
n
Ni
e
d
e
r
tests
:
document f
o
rmat o
f
conflicts
from c
h
eckout -m
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
next