?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
Grammar fix for "git merge" man page
2009-03-25 Johannes Sixtt7502-commit: Skip SIGTERM test on Windows
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-25 Johannes Sixtt7005-editor: Use $SHELL_PATH in the editor scripts
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-24 Johannes SixtMinGW: Quote arguments for subprocesses that contain...
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-22 Johannes Sixtt5503: GIT_DEBUG_SEND_PACK is not supported on MinGW
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-22 Johannes Sixtt7004: Use prerequisite tags to skip tests that need gpg
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-22 Johannes SixtUse prerequisites to skip tests that need unzip
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-22 Johannes Sixtt3700: Skip a test with backslashes in pathspec
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-22 Johannes SixtSkip tests that require a filesystem that obeys POSIX...
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-22 Johannes Sixtt0060: Fix tests on Windows
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-22 Johannes SixtUse prerequisite tags to skip tests that depend on...
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-22 Johannes Sixtt9100, t9129: Use prerequisite tags for UTF-8 tests
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-22 Johannes Sixtt5302: Use prerequisite tags to skip 64-bit offset...
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-22 Johannes SixtSkip tests that fail if the executable bit is not handled...
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-22 Johannes Sixtt3600: Use test prerequisite tags
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-22 Johannes SixtPropagate --exec-path setting to external commands...
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-21 Johannes Sixttest-lib: Infrastructure to test and check for prerequisites
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-19 Johannes Sixtt0050: Check whether git init detected symbolic link...
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-19 Johannes SixtTests on Windows: $(pwd) must return Windows-style...
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-19 Johannes Sixttest-lib: Work around missing sum on Windows
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-19 Johannes Sixttest-lib: Work around incompatible sort and find on...
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-19 Johannes Sixtt5602: Work around path mangling on MSYS
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-19 Johannes Sixtt5300, t5302, t5303: Do not use /dev/zero
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-19 Johannes Sixtt2200, t7004: Avoid glob pattern that also matches...
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-19 Johannes Sixttest-lib: Introduce test_chmod and use it instead of...
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-19 Johannes Sixttest-lib: Simplify test counting.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-19 Johannes Sixttest-lib: Replace uses of $(expr ...) by POSIX shell...
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-19 Johannes SixtCall 'say' outside test_expect_success
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-19 Johannes Sixttest suite: Use 'say' to say something instead of ...
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-18 Johannes Sixtt9400, t9401: Do not force hard-linked clone
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-14 Johannes Sixttest-suite: Make test script numbers unique
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-11 Johannes Sixtrecv_sideband: Bands #2 and #3 always go to stderr
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-03-02 Johannes Sixtt3400-rebase: Move detached HEAD check earlier
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-02-25 Johannes Sixtgitattributes.txt: Path matching rules are explained...
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-02-07 Johannes SixtRemove unused normalize_absolute_path()
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-02-07 Johannes SixtTest and fix normalize_path_copy()
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-02-07 Johannes SixtMove sanitary_path_copy() to path.c and rename it to...
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-02-07 Johannes SixtMake test-path-utils more robust against incorrect use
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-01-28 Johannes SixtWindows: Fix intermittent failures of t7701
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2009-01-22 Johannes SixtWindows: Fix signal numbers
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2008-12-21 Johannes Sixtgitk: Force the focus to the main window on Windows
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2008-12-21 Johannes Sixtgitk: Ensure that "Reset branch" menu entry is enabled
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2008-12-21 Johannes Sixtgitk: Use check-buttons' -text property instead of...
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2008-12-21 Johannes Sixtrebase -i -p: Fix --continue after a merge could not...
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2008-12-21 Johannes SixtShow a failure of rebase -p if the merge had a conflict
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2008-12-03 Johannes Sixtt4030-diff-textconv: Make octal escape sequence more...
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2008-11-24 Johannes Sixtcompat/mingw.c: Teach mingw_rename() to replace read...
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2008-11-01 Johannes Sixtgit-gui: Do not munge conflict marker lines in a normal...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-10-23 Johannes Sixtgit-remote: list branches in vertical lists
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
 commit | commitdiff | tree
2008-10-10 Johannes Sixtgit-gui: Mark-up strings in show_{other,unmerged}_diff...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-10-10 Johannes Sixtgit-gui: Show a round number of bytes of large untracked...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-10-10 Johannes Sixtgit-gui: Fix switch statement in lib/merge.tcl
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-10-08 Johannes Sixtgit-push.txt: Describe --repo option in more detail
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-09-30 Johannes Sixtgit-gui: Remove space from the end of aspell's reply...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-09-30 Johannes Sixtgit-gui: Do not automatically stage file after merge...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-09-29 Johannes Sixtcompat/mingw: Support a timeout in the poll emulation...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-09-22 Johannes Sixtgit-remote: do not use user input in a printf format...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-09-11 Johannes SixtUse compatibility regex library also on AIX
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-09-08 Johannes SixtWindows: git-shell can be compiled again
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-08-22 Johannes Sixtfilter-branch: Grok special characters in tag names
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-08-20 Johannes SixtInstall templates with the user and group of the installing...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-08-19 Johannes SixtRevert "Windows: Use a customized struct stat that...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-08-05 Johannes Sixtgit-gui: Adapt discovery of oguilib to execdir 'libexec...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-07-26 Johannes Sixtgit-gui: "Stage Line": Treat independent changes in...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-07-26 Johannes Sixtgit-gui: Fix "Stage/Unstage Line" with one line of...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-07-26 Johannes SixtWindows: Do not compile git-shell
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-07-26 Johannes SixtWindows: Make sure argv[0] has a path
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-07-26 Johannes SixtWindows: Make $(gitexecdir) relative
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-07-26 Johannes SixtAllow add_path() to add non-existent directories to...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-07-26 Johannes SixtAllow the built-in exec path to be relative to the...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-07-26 Johannes SixtFix relative built-in paths to be relative to the command...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-07-26 Johannes SixtRecord the command invocation path early
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-07-26 Johannes SixtMakefile: Normalize $(bindir) and $(gitexecdir) before...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-07-26 Johannes SixtMakefile: Do not install a copy of 'git' in $(gitexecdir)
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-07-23 Johannes Sixtrebase -i: When an 'edit' stops, mention the commit
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-07-19 Johannes Sixtbuiltin-clone: rewrite guess_dir_name()
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-07-16 Johannes Sixtt7600-merge: Use test_expect_failure to test option...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-07-09 Johannes SixtProvide fallback definitions of PRIu32 and PRIx32
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-07-04 Johannes Sixtt4127-apply-same-fn: Avoid sed -i
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-07-02 Johannes Sixtgit-gui: Implement "Stage/Unstage Line"
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-26 Johannes SixtWindows: TMP and TEMP environment variables specify...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-26 Johannes SixtWindows: Make 'git help -a' work.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-26 Johannes SixtWindows: Work around an oddity when a pipe with no...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-26 Johannes SixtWindows: Make the pager work.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-26 Johannes SixtWhen installing, be prepared that template_dir may...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-26 Johannes SixtWindows: Use a relative default template_dir and ETC_GITCONFIG
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-26 Johannes SixtWindows: Compute the fallback for exec_path from the...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-26 Johannes SixtTurn builtin_exec_path into a function.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-26 Johannes SixtWindows: Use a customized struct stat that also has...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-26 Johannes SixtWindows: Add a custom implementation for utime().
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-26 Johannes SixtWindows: Implement a custom spawnve().
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-26 Johannes SixtWindows: Implement wrappers for gethostbyname(), socket...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-26 Johannes SixtWindows: Work around incompatible sort and find.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-26 Johannes SixtWindows: Implement asynchronous functions as threads.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-26 Johannes SixtWindows: Disambiguate DOS style paths from SSH URLs.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-26 Johannes SixtWindows: A rudimentary poll() emulation.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-23 Johannes SixtWindows: Implement start_command().
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-23 Johannes SixtWindows: A pipe() replacement whose ends are not inherited...
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-23 Johannes SixtWindows: Wrap execve so that shell scripts can be invoked.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-23 Johannes SixtWindows: Implement setitimer() and sigaction().
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
2008-06-23 Johannes SixtWindows: Fix PRIuMAX definition.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
 commit | commitdiff | tree
next
Miklos' Git tree to make git-merge a builtin.