repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge script: tweak unmerged files message to match builtin
2010-08-18
Jonath
a
n Nieder
m
e
rge s
c
ript: tweak unmerged files message to m
a
tch
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge scrip
t
: --squash,
--ff fro
m
unborn br
a
nch are
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
fmt-mer
g
e
-
msg
-
m to override merge
title
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
merge-base
--independent to print reduced pare
n
t list
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
merge-bas
e
--octo
p
us to mimic show-branch
--
m
erge-b
a
se
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
Docum
e
n
t
ation: add a SEE ALSO section
f
or
merge-bas
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
na
t
han
N
ieder
t620
0
(
f
mt-merge-msg
)
: style nitpi
c
ks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan
N
ieder
t6010 (merge-b
a
se)
:
modernize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge): test merge f
r
om bra
n
ch yet to be bo
r
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
t
7600 (merge): check
reflog entry
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
t
7
600 (merge
)
:
do not la
u
nch
g
i
tk for --debug
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
a
n
Nieder
t76
0
0
(merge)
:
m
o
de
r
nize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
merge:
d
o not mistake (ancestor of) tag for branch
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Ni
e
der
t
/READ
M
E: correct an exception when breakin
g
a && chain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jonathan
N
ieder
Add a sam
p
le user
for the sv
n
dump
l
ibrary
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jona
t
han Nieder
Doc
u
menta
t
ion: add submodule
.
* to th
e
big confi
g
uration
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
gitmo
d
ul
e
s
.
5: url can
be a
r
el
a
tive pa
t
h
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
J
onatha
n
Niede
r
git --paginate:
paginate ext
e
rnal commands again
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
Jonatha
n
Nieder
t
3
000 (ls
-
files -
o
)
: m
o
dernize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
Jonathan Nieder
t
9
118 (git-svn): prevent
e
arly failure
from
taking
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
J
o
nathan Nieder
t/README
:
docume
n
t mo
r
e test
helpers
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
Jona
t
han Nied
e
r
revert:
d
o not
r
ebuild argv
o
n heap
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonatha
n
Nieder
tests
:
loca
l
conf
i
g fi
l
e sh
o
uld b
e
honored from sub
d
i
rs
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonath
a
n N
i
ede
r
t7006:
test pag
e
r configuration for
s
everal git c
o
mm
a
nds
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
J
o
nathan N
i
eder
t
7
0
0
6 (p
a
g
er):
i
ntroduce helper
for
parame
t
e
r
iz
e
d tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonatha
n
Nieder
t3508 (cherry-
p
ick
)
:
futur
e
proof against unmerged files
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nieder
git-sv
n
: strip off leading s
l
ashes on --tr
u
nk argume
n
t
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
J
o
nathan Nieder
add-interact
i
ve: Clar
i
f
y “remaining h
u
nks in the file”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Nieder
grep:
r
e
factor gre
p
_
o
bj
e
c
ts
l
oop into
i
ts own
functio
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonath
a
n
N
ieder
Documentat
i
on/ch
e
ckout: c
l
arif
y
descript
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jon
a
t
h
an N
i
eder
r
e
base -i -p: document shortcom
i
ngs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Jonathan
Nieder
DWIM '
g
it
s
how -5'
to
'
g
it sh
o
w --do-walk -5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
J
on
a
than Nieder
g
itignore
.
5: Clarify matching r
u
l
es
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
J
o
nat
h
an Nieder
r
ebase:
i
mprove e
r
ror mess
a
g
e when up
s
trea
m
argu
m
ent
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
Docume
n
tation/
c
heckout: clarify descri
p
tion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jonathan
N
ieder
f
s
ck: fix bogus comm
i
t header check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jo
n
athan Nieder
Ad
d
git r
e
m
o
te set-br
a
nches
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonath
a
n Nieder
post-receive-emai
l
: document command-line
m
ode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n Nieder
gi
t
sv
n
:
a
v
oid uninitialized v
a
r in 'reset'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nathan
N
ieder
M
a
k
e
f
i
le: let hea
d
er de
p
e
ndency c
h
ecker
override COMPUTE_HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
Nieder
Makefile: fix head
e
r dependency checker
t
o
allo
w
NO
_
CURL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
i
eder
D
o
c
u
men
t
ation/notes
:
nitpick
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
a
t
han Nieder
Documentation/notes:
c
lean up description of rewritin
g
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Do
c
umenta
t
ion/notes:
simplify t
r
eatment of default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ieder
Documen
t
ati
o
n
/
log: add
a CONFI
G
U
RA
T
ION section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
Nieder
Documentation/notes: simplify
treatment of
d
efau
l
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han Nieder
Documentation/no
t
es: add configura
t
ion section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Do
c
ument
a
tion
/
no
t
es:
descr
i
b
e
co
n
tent of n
o
t
e
s blobs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
than Niede
r
D
o
c
u
men
t
ation/not
e
s
:
d
ocument
f
ormat of
note
s
tre
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonath
a
n
N
i
eder
cherry-pick: do not dump c
o
re
when iconv
fails
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nie
d
e
r
pr
e
t
ty: initializ
e
n
e
w cmt
_
fmt_map to 0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan
N
ieder
adapt request-
p
ull tests for ne
w
pull request format
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jonathan Ni
e
der
test-li
b
: some shell
s
do not let $? propaga
t
e into
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
tha
n
Nieder
s
h
ortlo
g
: Document and test --format
o
ptio
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
t
4201 (shortlog): Test output format with multipl
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonatha
n
N
i
eder
t4201 (shortlo
g
): gua
r
d s
e
tup with t
e
st_ex
p
ect_
s
uccess
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan N
i
eder
Docume
n
tation/
s
h
ortlog:
s
cripted users should n
o
t rely
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
than Ni
e
d
e
r
commi
t
--amend: cope w
i
th
m
issing display
n
ame
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
athan
N
i
eder
te
s
t-lib: Let tests
specify
c
o
m
mands to be
run at
e
nd
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
fsck
:
check ident li
n
e
s
in
commit object
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
J
o
nathan Nieder
request-
p
ull: protect again
s
t OPTIONS_KEEPDASHDASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nie
d
er
tests for request-pull
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jonat
h
an Nieder
Do
c
umentation/Makefil
e
: fix interrupted bui
l
ds of user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan
Nieder
fix "bundle
-
-
s
tdin" segfault
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
t5704 (bundle): add tests for bundle --stdin
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jonathan Nie
d
e
r
tag
-
v: u
s
e RUN_
G
IT
_
CMD to ru
n
ve
r
i
f
y
-
t
a
g
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jo
n
athan Nie
d
e
r
Do
c
ument new "already
-
merged" rule fo
r
bra
n
ch -d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonat
h
an Nie
d
er
Add
.
d
e
pend directories
t
o
.
gitign
o
r
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
J
onathan
N
ieder
t7006: g
u
ard cleanup wi
t
h
t
est_expect_s
u
cces
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jonathan Nieder
t5800: test
g
it helper requires Python
s
u
pport
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jo
n
athan Ni
e
der
t7400: clari
f
y submo
d
ule
update tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t7400
:
clarify 'sub
m
odule add' tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
J
o
nath
a
n N
i
eder
t
7
400: sp
l
it
setup
into multiple tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
J
o
nathan Nieder
Teach mailinfo %< as an alternative scissors
mar
k
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan
N
i
eder
Makefile
:
future-proof Cygwin version check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-recursive: add a label for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
cherry-pick, r
e
ve
r
t:
a
dd a label for a
n
cest
o
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
revert:
clarify l
a
bel on conflict
h
u
nk
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
compat
:
add mempcpy()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
checkout -m --
c
onflict=diff3: ad
d
a label for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nieder
m
e
rge_tree
s
()
:
add a
n
cestor label parameter for
diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
t
han N
i
eder
merge_file(): add
c
o
m
ment explaini
n
g behavior wrt conflict
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
check
o
ut --conflict=diff3: add a label for
ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
l
l
_m
e
rge(): add ancestor
label
p
aramet
e
r
for diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
merge-file --diff3: add a label for a
n
cestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Niede
r
xdl_merge(): move fi
l
e1 and file2 labels to xmpara
m
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
na
t
h
a
n Nieder
xdl_me
r
ge(): add opt
i
onal ances
t
or
lab
e
l to diff3-s
t
yle
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
tests: d
o
c
ument cherry-pick behavior
i
n face of conflicts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
h
a
n Nieder
t
e
sts:
d
ocument
f
ormat
of conf
l
icts from
c
heck
o
u
t -
m
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onatha
n
Nie
d
er
rev
e
rt: fix tiny mem
o
ry leak in cherry-pick --ff
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonat
h
an
N
ieder
Makefile: Fi
x
occasional GIT
-
CFLAGS
breakage
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonatha
n
Nieder
M
a
k
efile: Fix CDPATH pro
b
lem
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonat
h
an Nieder
git
k
: Don'
t
clobber "Remember
this vie
w
"
s
etting
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonath
a
n
Nieder
g
i
tk:
Add comments to e
x
p
lain e
n
co
d
e_view_o
p
ts and
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-28
Jo
n
athan Nieder
Makefile: clarify de
f
inition of TES
T
_OBJS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-23
Jonathan
Nied
e
r
am: rem
o
ve rebase-ap
p
l
y
di
r
ectory
before g
c
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-22
J
ona
t
ha
n
Nieder
test
s
: Fix rac
e
c
ondition i
n
t7006-p
a
g
e
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-21
Jo
n
athan Nieder
t
7006-pager: i
f
stdou
t
is
n
o
t a terminal,
make a new o
n
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-20
Jon
a
t
han Ni
e
der
t
e
sts
:
Add tests for automatic use of page
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
am: Fix launch
i
ng of pa
g
er
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next