Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | docs: stop using asciidoc no-inline-literal | Jeff King | 2012-04-26 | 53 | -194/+192 |
* | Start preparing for 1.7.10.1 | Junio C Hamano | 2012-04-26 | 2 | -1/+51 |
* | Merge branch 'jk/run-command-eacces' into maint | Junio C Hamano | 2012-04-26 | 6 | -7/+86 |
|\ | |||||
| * | run-command: treat inaccessible directories as ENOENT | Jeff King | 2012-04-05 | 4 | -3/+80 |
| * | compat/mingw.[ch]: Change return type of exec functions to int | Ramsay Jones | 2012-04-05 | 2 | -4/+6 |
* | | Merge branch 'jc/push-upstream-sanity' into maint | Junio C Hamano | 2012-04-26 | 2 | -8/+72 |
|\ \ | |||||
| * | | push: error out when the "upstream" semantics does not make sense | Junio C Hamano | 2012-04-05 | 2 | -8/+72 |
* | | | Merge branch 'jc/maint-clean-nested-worktree-in-subdir' into maint | Junio C Hamano | 2012-04-26 | 2 | -11/+43 |
|\ \ \ | |||||
| * | | | clean: preserve nested git worktree in subdirectoriesjc/maint-clean-nested-worktree-in-subdir | Junio C Hamano | 2012-03-15 | 2 | -11/+43 |
* | | | | Merge branch 'jk/diff-no-rename-empty' into maint | Junio C Hamano | 2012-04-26 | 9 | -14/+45 |
|\ \ \ \ | |||||
| * | | | | merge-recursive: don't detect renames of empty filesjk/diff-no-rename-empty | Jeff King | 2012-03-23 | 2 | -0/+17 |
| * | | | | teach diffcore-rename to optionally ignore empty content | Jeff King | 2012-03-23 | 3 | -1/+12 |
| * | | | | make is_empty_blob_sha1 available everywhere | Jeff King | 2012-03-23 | 2 | -10/+13 |
| * | | | | drop casts from users EMPTY_TREE_SHA1_BIN | Jeff King | 2012-03-23 | 3 | -3/+3 |
* | | | | | Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maint | Junio C Hamano | 2012-04-26 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | combine-diff: fix loop index underflowrs/combine-diff-zero-context-at-the-beginning | René Scharfe | 2012-03-25 | 1 | -1/+1 |
* | | | | | | Merge branch 'jc/commit-unedited-template' into maint | Junio C Hamano | 2012-04-26 | 3 | -24/+65 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation/git-commit: rephrase the "initial-ness" of templates | Junio C Hamano | 2012-04-03 | 1 | -5/+8 |
| * | | | | | | git-commit.txt: clarify -t requires editing message | Adam Monsen | 2012-04-01 | 1 | -5/+5 |
| * | | | | | | commit: rephrase the error when user did not touch templated log message | Junio C Hamano | 2012-03-30 | 2 | -19/+47 |
| * | | | | | | commit: do not trigger bogus "has templated message edited" check | Junio C Hamano | 2012-03-30 | 2 | -0/+8 |
| * | | | | | | t7501: test the right kind of breakage | Junio C Hamano | 2012-03-30 | 1 | -0/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'jk/add-p-skip-conflicts' into maint | Junio C Hamano | 2012-04-26 | 2 | -7/+44 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add--interactive: ignore unmerged entries in patch mode | Jeff King | 2012-04-05 | 2 | -7/+44 |
* | | | | | | | Merge branch 'jc/commit-hook-authorship' into maint | Junio C Hamano | 2012-04-26 | 5 | -47/+141 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | commit: pass author/committer info to hooksjc/commit-hook-authorship | Junio C Hamano | 2012-03-11 | 2 | -4/+20 |
| * | | | | | | | t7503: does pre-commit-hook learn authorship? | Junio C Hamano | 2012-03-11 | 1 | -0/+18 |
| * | | | | | | | ident.c: add split_ident_line() to parse formatted ident line | Junio C Hamano | 2012-03-11 | 3 | -44/+104 |
* | | | | | | | | Merge branch 'tr/maint-word-diff-regex-sticky' into maint | Junio C Hamano | 2012-04-26 | 2 | -56/+102 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diff: tweak a _copy_ of diff_options with word-difftr/maint-word-diff-regex-sticky | Thomas Rast | 2012-03-14 | 2 | -2/+5 |
| * | | | | | | | | diff: refactor the word-diff setup from builtin_diff_cmd | Thomas Rast | 2012-03-14 | 1 | -56/+63 |
| * | | | | | | | | t4034: diff.*.wordregex should not be "sticky" in --word-diff | Johannes Sixt | 2012-03-14 | 1 | -0/+36 |
* | | | | | | | | | Merge branch 'jh/notes-merge-in-git-dir-worktree' into maint | Junio C Hamano | 2012-04-26 | 4 | -32/+73 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdjh/notes-merge-in-git-dir-worktree | Johan Herland | 2012-03-15 | 2 | -8/+13 |
| * | | | | | | | | | notes-merge: use opendir/readdir instead of using read_directory() | Johan Herland | 2012-03-15 | 2 | -21/+31 |
| * | | | | | | | | | t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/ | Johan Herland | 2012-03-15 | 1 | -0/+19 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | remove_dir_recursively(): Add flag for skipping removal of toplevel dir | Junio C Hamano | 2012-03-15 | 2 | -4/+11 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Sync with 1.7.9.7 | Junio C Hamano | 2012-04-26 | 5 | -4/+55 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Git 1.7.9.7v1.7.9.7maint-1.7.9 | Junio C Hamano | 2012-04-26 | 3 | -2/+16 |
| * | | | | | | | | Sync with 1.7.8.6 | Junio C Hamano | 2012-04-26 | 4 | -3/+40 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Git 1.7.8.6v1.7.8.6maint-1.7.8 | Junio C Hamano | 2012-04-26 | 4 | -3/+27 |
| | * | | | | | | | | Sync with 1.7.7.7 | Junio C Hamano | 2012-04-26 | 3 | -2/+16 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Git 1.7.7.7v1.7.7.7maint-1.7.7 | Junio C Hamano | 2012-04-26 | 4 | -3/+18 |
| | | * | | | | | | | | bundle: remove stray single-quote from error message | Jonathan Nieder | 2012-04-26 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'maint-1.7.9' into maint | Junio C Hamano | 2012-04-10 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge branch 'maint-1.7.8' into maint-1.7.9 | Junio C Hamano | 2012-04-10 | 2 | -6/+6 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8 | Junio C Hamano | 2012-04-09 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'dw/gitweb-doc-grammo' into maint-1.7.8 | Junio C Hamano | 2012-04-09 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'tr/cache-tree' into maint-1.7.8 | Junio C Hamano | 2012-04-09 | 10 | -11/+142 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8 | Junio C Hamano | 2012-04-09 | 2 | -4/+33 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |